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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

diff --combined Documentation/kernel-parameters.txt
index 6b979d1d09ab50489c79ac94f7a537733ce2c98b,6dda1cc3fbafe6b43f4adb914537bc597d72b390..d1e2fcb6298b6f2ae7873a033602b52510463e66
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -836,6 -836,12 +836,12 @@@ and is between 256 and 4096 characters
                               If specified, z/VM IUCV HVC accepts connections
                               from listed z/VM user IDs only.
  
+       i2c_bus=        [HW] Override the default board specific I2C bus speed
+                            or register an additional I2C bus that is not
+                            registered from board initialization code.
+                            Format:
+                            <bus_id>,<clkrate>
+ 
        i8042.debug     [HW] Toggle i8042 debug mode
        i8042.direct    [HW] Put keyboard port into non-translated mode
        i8042.dumbkbd   [HW] Pretend that controller can only read data from
@@@ -1325,13 -1331,8 +1331,13 @@@
  
        memtest=        [KNL,X86] Enable memtest
                        Format: <integer>
 -                      range: 0,4 : pattern number
                        default : 0 <disable>
 +                      Specifies the number of memtest passes to be
 +                      performed. Each pass selects another test
 +                      pattern from a given set of patterns. Memtest
 +                      fills the memory with this pattern, validates
 +                      memory contents and reserves bad memory
 +                      regions that are detected.
  
        meye.*=         [HW] Set MotionEye Camera parameters
                        See Documentation/video4linux/meye.txt.

diff --combined MAINTAINERS
index d8a4c8d0a5544bbbe9d749b858eb4d4fbb1d13c3,da488ce9e96a7e1ca84dac3354e4b7e4b48b39ac..01243ce6d998ac2c17213157d8d7c812f8057695
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -502,6 -502,13 +502,13 @@@ P:       Richard Purdi
  M:    [email protected]
  S:    Maintained
  
+ ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE
+ P:    Paulius Zaleckas
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ T:    git gitorious.org/linux-gemini/mainline.git
+ S:    Maintained
+ 
  ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6)
  P:    Daniel Ribeiro
  M:    [email protected]
@@@ -513,6 -520,12 +520,12 @@@ L:       [email protected] (sub
  W:    http://www.openezx.org/
  S:    Maintained
  
+ ARM/FARADAY FA526 PORT
+ P:    Paulius Zaleckas
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ S:    Maintained
+ 
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
  P:    Sascha Hauer
  M:    [email protected]
@@@ -622,7 -635,7 +635,7 @@@ P: Dirk Opfe
  M:    [email protected]
  S:    Maintained
  
- ARM/PALMTX SUPPORT
+ ARM/PALMTX,PALMT5,PALMLD SUPPORT
  P:    Marek Vasut
  M:    [email protected]
  W:    http://hackndev.com
@@@ -3309,16 -3322,6 +3322,16 @@@ L:    [email protected]
  L:    [email protected]
  W:    http://www.nongnu.org/orinoco/
  S:    Maintained
 +
 +OSD LIBRARY
 +P:    Boaz Harrosh
 +M:    [email protected]
 +P:    Benny Halevy
 +M:    [email protected]
 +L:    [email protected]
 +W:    http://open-osd.org
 +T:    git://git.open-osd.org/open-osd.git
 +S:    Maintained
  
  P54 WIRELESS DRIVER
  P:    Michael Wu
@@@ -3570,6 -3573,22 +3583,22 @@@ M:    [email protected]
  L:    [email protected] (subscribers-only)
  S:    Maintained
  
+ PXA168 SUPPORT
+ P:    Eric Miao
+ M:    [email protected]
+ P:    Jason Chagas
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ T:    git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+ S:    Supported
+ 
+ PXA910 SUPPORT
+ P:    Eric Miao
+ M:    [email protected]
+ L:    [email protected] (subscribers-only)
+ T:    git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
+ S:    Supported
+ 
  PXA MMCI DRIVER
  S:    Orphan
  

diff --combined arch/arm/kernel/vmlinux.lds.S
index 1602373e539cf72adc4176635f4364b4c6376c96,5f664599c945bab7e696f2b234378ad41ee00c03..c90f27250eadd71ac093eb40b2113a5147f94f22
--- 1/arch/arm/kernel/vmlinux.lds.S
--- 2/arch/arm/kernel/vmlinux.lds.S
+++ b/arch/arm/kernel/vmlinux.lds.S
@@@ -64,9 -64,7 +64,9 @@@ SECTION
                __initramfs_end = .;
  #endif
                . = ALIGN(4096);
 +              __per_cpu_load = .;
                __per_cpu_start = .;
 +                      *(.data.percpu.page_aligned)
                        *(.data.percpu)
                        *(.data.percpu.shared_aligned)
                __per_cpu_end = .;
@@@ -82,6 -80,8 +82,8 @@@
                EXIT_TEXT
                EXIT_DATA
                *(.exitcall.exit)
+               *(.ARM.exidx.exit.text)
+               *(.ARM.extab.exit.text)
  #ifndef CONFIG_MMU
                *(.fixup)
                *(__ex_table)
@@@ -112,6 -112,23 +114,23 @@@
  
        _etext = .;                     /* End of text and rodata section */
  
+ #ifdef CONFIG_ARM_UNWIND
+       /*
+        * Stack unwinding tables
+        */
+       . = ALIGN(8);
+       .ARM.unwind_idx : {
+               __start_unwind_idx = .;
+               *(.ARM.exidx*)
+               __stop_unwind_idx = .;
+       }
+       .ARM.unwind_tab : {
+               __start_unwind_tab = .;
+               *(.ARM.extab*)
+               __stop_unwind_tab = .;
+       }
+ #endif
+ 
  #ifdef CONFIG_XIP_KERNEL
        __data_loc = ALIGN(4);          /* location in binary */
        . = PAGE_OFFSET + TEXT_OFFSET;