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

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (76 commits)
  [ARM] 4002/1: S3C24XX: leave parent IRQs unmasked
  [ARM] 4001/1: S3C24XX: shorten reboot time
  [ARM] 3983/2: remove unused argument to __bug()
  [ARM] 4000/1: Osiris: add third serial port in
  [ARM] 3999/1: RX3715: suspend to RAM support
  [ARM] 3998/1: VR1000: LED platform devices
  [ARM] 3995/1: iop13xx: add iop13xx support
  [ARM] 3968/1: iop13xx: add iop13xx_defconfig
  [ARM] Update mach-types
  [ARM] Allow gcc to optimise arm_add_memory a little more
  [ARM] 3991/1: i.MX/MX1 high resolution time source
  [ARM] 3990/1: i.MX/MX1 more precise PLL decode
  [ARM] 3986/1: H1940: suspend to RAM support
  [ARM] 3985/1: ixp4xx clocksource cleanup
  [ARM] 3984/1: ixp4xx/nslu2: Fix disk LED numbering (take 2)
  [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
  [ARM] 3981/1: sched_clock for PXA2xx
  [ARM] 3980/1: extend the ARM Versatile sched_clock implementation from 32 to 63 bit
  [ARM] 3979/1: extend the SA11x0 sched_clock implementation from 32 to 63 bit period
  [ARM] 3978/1: macro to provide a 63-bit value from a 32-bit hardware counter
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/kernel/signal.c
index f38a60a03b8c93f5b2e36fde8b985dc7196e47a3,f2b1d61fbc0edbd4c82adcf353cbdd4e1ca50b27..3843d3bab2ddc4d2e7eb536cc8380ee3d420d5f5
--- 1/arch/arm/kernel/signal.c
--- 2/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@@ -11,8 -11,8 +11,9 @@@
  #include <linux/signal.h>
  #include <linux/ptrace.h>
  #include <linux/personality.h>
 +#include <linux/freezer.h>
  
+ #include <asm/elf.h>
  #include <asm/cacheflush.h>
  #include <asm/ucontext.h>
  #include <asm/uaccess.h>

diff --cc arch/arm/mach-s3c2410/Kconfig
Simple merge

diff --cc arch/arm/mm/Kconfig
Simple merge

diff --cc drivers/i2c/busses/Kconfig
Simple merge

diff --cc drivers/mmc/Kconfig
Simple merge

diff --cc drivers/mmc/at91_mci.c
Simple merge

diff --cc drivers/pcmcia/at91_cf.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge