Merge current mainline tree into linux-omap tree

Merge branch 'linus'

Conflicts:

	arch/arm/mach-omap1/board-h2.c
	arch/arm/mach-omap2/clock.c
	drivers/video/omap/Kconfig
	net/ipv4/netfilter/Makefile

diff --cc Makefile
index e4b927657e80f2d6603965825efe1c3a7bdf2a8e,a65ffd27de6b5f6786f2d17cc716f003efa628b9..305598026bae617929c297b7c5a79b34431c435e
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -171,10 -168,9 +171,11 @@@ export srctree objtree VPATH TOPDI
  SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \
                                  -e s/arm.*/arm/ -e s/sa110/arm/ \
                                  -e s/s390x/s390/ -e s/parisc64/parisc/ \
-                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ )
+                                 -e s/ppc.*/powerpc/ -e s/mips.*/mips/ \
+                                 -e s/sh[234].*/sh/ )
  
 +SUBARCH := arm
 +
  # Cross compiling and selecting different set of gcc/bin-utils
  # ---------------------------------------------------------------------------
  #

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mm/proc-arm926.S
Simple merge

diff --cc arch/arm/vfp/vfpmodule.c
Simple merge

diff --cc drivers/Makefile
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/net/smc91x.h
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/video/omap/Kconfig
index 4f7941ffe74020d8ec885f88905719211f40bcf7,44408850e2ebc2d0047e1bae7d7a82a5d735e135..bdeb8fbbdda48ee251055044f6b9e062c2fadfe3
--- 1/drivers/video/omap/Kconfig
--- 2/drivers/video/omap/Kconfig
+++ b/drivers/video/omap/Kconfig
@@@ -4,47 -4,9 +4,47 @@@ config FB_OMA
        select FB_CFB_FILLRECT
        select FB_CFB_COPYAREA
        select FB_CFB_IMAGEBLIT
-         help
+       help
            Frame buffer driver for OMAP based boards.
  
 +config FB_OMAP_LCDC_EXTERNAL
 +      bool "External LCD controller support"
 +      depends on FB_OMAP
 +      help
 +        Say Y here, if you want to have support for boards with an
 +        external LCD controller connected to the SoSSI/RFBI interface.
 +
 +config FB_OMAP_LCDC_HWA742
 +      bool "Epson HWA742 LCD controller support"
 +      depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
 +      help
 +        Say Y here if you want to have support for the external
 +        Epson HWA742 LCD controller.
 +
 +config FB_OMAP_LCDC_BLIZZARD
 +      bool "Epson Blizzard LCD controller support"
 +      depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
 +      help
 +        Say Y here if you want to have support for the external
 +        Epson Blizzard LCD controller.
 +
 +config FB_OMAP_MANUAL_UPDATE
 +      bool "Default to manual update mode"
 +      depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL
 +      help
 +        Say Y here, if your user-space applications are capable of
 +        notifying the frame buffer driver when a change has occured in
 +          the frame buffer content and thus a reload of the image data to
 +        the external frame buffer is required. If unsure, say N.
 +
 +config FB_OMAP_LCD_MIPID
 +      bool "MIPI DBI-C/DCS compatible LCD support"
 +      depends on FB_OMAP && SPI_MASTER && CBUS_TAHVO
 +      help
 +        Say Y here if you want to have support for LCDs compatible with
 +        the Mobile Industry Processor Interface DBI-C/DCS
 +        specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3)
 +
  config FB_OMAP_BOOTLOADER_INIT
        bool "Check bootloader initialization"
        depends on FB_OMAP

diff --cc drivers/watchdog/Kconfig
Simple merge

diff --cc include/asm-arm/pgtable.h
Simple merge

diff --cc net/ipv4/netfilter/Kconfig
Simple merge

diff --cc net/ipv4/netfilter/Makefile
index 568bf0eaa459f93228551f7e72b13d7978735d6e,7456833d6ade438f3b5c5f478fb6062cdaf5e3a2..9b22b3db6e2fcb276230c4f182c0504cf47ca4a5
--- 1/net/ipv4/netfilter/Makefile
--- 2/net/ipv4/netfilter/Makefile
+++ b/net/ipv4/netfilter/Makefile
@@@ -41,28 -41,27 +41,28 @@@ obj-$(CONFIG_NF_NAT) += iptable_nat.
  obj-$(CONFIG_IP_NF_RAW) += iptable_raw.o
  
  # matches
+ obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
+ obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
+ obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
  obj-$(CONFIG_IP_NF_MATCH_IPRANGE) += ipt_iprange.o
  obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o
- obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o
- obj-$(CONFIG_IP_NF_MATCH_ECN) += ipt_ecn.o
- obj-$(CONFIG_IP_NF_MATCH_AH) += ipt_ah.o
+ obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o
  obj-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl.o
- obj-$(CONFIG_IP_NF_MATCH_ADDRTYPE) += ipt_addrtype.o
  
  # targets
- obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
- obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
+ obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
  obj-$(CONFIG_IP_NF_TARGET_ECN) += ipt_ECN.o
+ obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
  obj-$(CONFIG_IP_NF_TARGET_MASQUERADE) += ipt_MASQUERADE.o
- obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
  obj-$(CONFIG_IP_NF_TARGET_NETMAP) += ipt_NETMAP.o
+ obj-$(CONFIG_IP_NF_TARGET_REDIRECT) += ipt_REDIRECT.o
+ obj-$(CONFIG_IP_NF_TARGET_REJECT) += ipt_REJECT.o
  obj-$(CONFIG_IP_NF_TARGET_SAME) += ipt_SAME.o
- obj-$(CONFIG_IP_NF_TARGET_LOG) += ipt_LOG.o
- obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
- obj-$(CONFIG_IP_NF_TARGET_CLUSTERIP) += ipt_CLUSTERIP.o
 +obj-$(CONFIG_IP_NF_TARGET_IDLETIMER) += ipt_IDLETIMER.o
+ obj-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS.o
  obj-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL.o
+ obj-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG.o
  
  # generic ARP tables
  obj-$(CONFIG_IP_NF_ARPTABLES) += arp_tables.o