Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (272 commits)
  Fix soc_common PCMCIA configuration
  ARM: 5827/1: SA1100: h3100/h3600: emit messages on failed gpio_request
  ARM: 5826/1: SA1100: h3100/h3600: always build htc-egpio driver
  ARM: 5825/1: SA1100: h3600: update defconfig
  ARM: 5824/1: SA1100: reuse h3600 PCMCIA driver on h3100
  ARM: 5823/1: SA1100: h3100/h3600: add support for gpio-keys
  ARM: 5822/1: SA1100: h3100/h3600: clean up #includes
  ARM: 5821/1: SA1100: h3100/h3600: revise copyright boilerplates
  ARM: 5820/1: SA1100: h3100/h3600: split h3600.c
  ARM: 5819/1: SA1100: h3100/h3600: merge h3600.h and h3600_gpio.h into h3xxx.h
  ARM: 5818/1: SA1100: h3100/h3600: drop old GPIO definitions
  ARM: 5817/1: SA1100: h3100/h3600: configure all unused gpios as inputs
  ARM: 5816/1: SA1100: h3600: remove IRQ_GPIO_* definitions
  ARM: 5815/1: SA1100: h3100/h3600: remove now unused assign_h3600_egpio handlers
  ARM: 5814/1: SA1100: h3100/h3600: convert all users of assign_h3600_egpio to gpiolib
  ARM: 5813/1: SA1100: h3100/h3600: add htc-egpio driver
  ARM: 5812/1: SA1100: h3100/h3600: separate machine-specific LCD helpers
  ARM: 5811/2: pcmcia: convert sa1100_h3600 driver to gpiolib
  ARM: 5799/1: SA1100: h3600: stop setting direction for LCD pins
  ARM: 5798/1: SA1100: h3600: remove unused cruft from h3600.h
  ...

diff --combined MAINTAINERS
index 89ceb4005c5d481a6cc1c223309e756f460bfb6f,75f771c8579fd02b32e7b6d4c2d1cf4b5fd8b634..4a5d67620a511f001da55928e0a3410c2ad7c5a3
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -659,6 -659,9 +659,9 @@@ ARM/FREESCALE IMX / MXC ARM ARCHITECTUR
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
+ T:    git://git.pengutronix.de/git/imx/linux-2.6.git
+ F:    arch/arm/mach-mx*/
+ F:    arch/arm/plat-mxc/
  
  ARM/GLOMATION GESBC9312SX MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -729,6 -732,19 +732,19 @@@ L:       linux-arm-kernel@lists.infradead.or
  S:    Maintained
  F:    arch/arm/mach-ixp4xx/
  
+ ARM/INTEL RESEARCH IMOTE 2 MACHINE SUPPORT
+ M:    Jonathan Cameron <jic23@cam.ac.uk>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/imote2.c
+ 
+ ARM/INTEL RESEARCH STARGATE 2 MACHINE SUPPORT
+ M:    Jonathan Cameron <jic23@cam.ac.uk>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-pxa/stargate2.c
+ F:    drivers/pcmcia/pxa2xx_stargate2.c
+ 
  ARM/INTEL XSC3 (MANZANO) ARM CORE
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  M:    Dan Williams <dan.j.williams@intel.com>
@@@ -771,6 -787,14 +787,14 @@@ ARM/NEC MOBILEPRO 900/c MACHINE SUPPOR
  M:    Michael Petchkovsky <mkpetch@internode.on.net>
  S:    Maintained
  
+ ARM/NOMADIK ARCHITECTURE
+ M:     Alessandro Rubini <rubini@unipv.it>
+ M:     STEricsson <STEricsson_nomadik_linux@list.st.com>
+ L:     linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:     Maintained
+ F:     arch/arm/mach-nomadik/
+ F:     arch/arm/plat-nomadik/
+ 
  ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT
  M:    Nelson Castillo <arhuaco@freaks-unidos.net>
  L:    openmoko-kernel@lists.openmoko.org (subscribers-only)
@@@ -915,6 -939,12 +939,12 @@@ L:       linux-arm-kernel@lists.infradead.or
  W:    http://www.mcuos.com
  S:    Maintained
  
+ ARM/U8500 ARM ARCHITECTURE
+ M:    Srinidhi Kasagar <srinidhi.kasagar@stericsson.com>
+ L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ S:    Maintained
+ F:    arch/arm/mach-ux500/
+ 
  ARM/VFP SUPPORT
  M:    Russell King <linux@arm.linux.org.uk>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1120,6 -1150,7 +1150,6 @@@ F:      include/net/ax25.
  F:    net/ax25/
  
  B43 WIRELESS DRIVER
 -M:    Michael Buesch <mb@bu3sch.de>
  M:    Stefano Brivio <stefano.brivio@polimi.it>
  L:    linux-wireless@vger.kernel.org
  W:    http://linuxwireless.org/en/users/Drivers/b43
@@@ -2816,15 -2847,6 +2846,15 @@@ T:    git git://git.kernel.org/pub/scm/lin
  S:    Supported
  F:    drivers/net/wireless/iwlwifi/
  
 +INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
 +M:    Samuel Ortiz <samuel.ortiz@intel.com>
 +M:    Zhu Yi <yi.zhu@intel.com>
 +M:    Intel Linux Wireless <ilw@linux.intel.com>
 +L:    linux-wireless@vger.kernel.org
 +S:    Supported
 +W:    http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
 +F:    drivers/net/wireless/iwmc3200wifi/
 +
  IOC3 ETHERNET DRIVER
  M:    Ralf Baechle <ralf@linux-mips.org>
  L:    linux-mips@linux-mips.org
@@@ -3749,9 -3771,9 +3779,9 @@@ F:      include/linux/if_
  F:    include/linux/*device.h
  
  NETXEN (1/10) GbE SUPPORT
 -M:    Dhananjay Phadke <dhananjay@netxen.com>
 +M:    Amit Kumar Salecha <amit.salecha@qlogic.com>
  L:    netdev@vger.kernel.org
 -W:    http://www.netxen.com
 +W:    http://www.qlogic.com
  S:    Supported
  F:    drivers/net/netxen/
  

diff --combined arch/arm/mach-s3c6400/include/mach/map.h
index 866be31872a527d65393b468435804b25dd5b522,f3b48f841d84712690564fd5369e226b085cd1c0..106ee13581e284265a79e1400cf7483e96e3c52e
--- 1/arch/arm/mach-s3c6400/include/mach/map.h
--- 2/arch/arm/mach-s3c6400/include/mach/map.h
+++ b/arch/arm/mach-s3c6400/include/mach/map.h
@@@ -48,8 -48,6 +48,8 @@@
  #define S3C64XX_PA_IIS1               (0x7F003000)
  #define S3C64XX_PA_TIMER      (0x7F006000)
  #define S3C64XX_PA_IIC0               (0x7F004000)
 +#define S3C64XX_PA_PCM0               (0x7F009000)
 +#define S3C64XX_PA_PCM1               (0x7F00A000)
  #define S3C64XX_PA_IISV4      (0x7F00D000)
  #define S3C64XX_PA_IIC1               (0x7F00F000)
  
@@@ -66,6 -64,9 +66,9 @@@
  
  #define S3C64XX_PA_USBHOST    (0x74300000)
  
+ #define S3C64XX_PA_USB_HSPHY  (0x7C100000)
+ #define S3C64XX_VA_USB_HSPHY  S3C_ADDR_CPU(0x00200000)
+ 
  /* place VICs close together */
  #define S3C_VA_VIC0           (S3C_VA_IRQ + 0x00)
  #define S3C_VA_VIC1           (S3C_VA_IRQ + 0x10000)
@@@ -81,5 -82,6 +84,6 @@@
  #define S3C_PA_FB             S3C64XX_PA_FB
  #define S3C_PA_USBHOST                S3C64XX_PA_USBHOST
  #define S3C_PA_USB_HSOTG      S3C64XX_PA_USB_HSOTG
+ #define S3C_VA_USB_HSPHY      S3C64XX_VA_USB_HSPHY
  
  #endif /* __ASM_ARCH_6400_MAP_H */