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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (60 commits)
  [ARM] 4524/1: S3C: Move register out of include/asm-arm/arch-s3c2410
  [ARM] 4523/1: S3C: Remove FIFO_MAX from uncompression headers
  [ARM] 4522/1: S3C: split include/asm-arm/arch/memory.h
  [ARM] 4521/2: S3C: Reorganise VA mapping headers
  [ARM] 4520/1: S3C: Remove old VA values from static map
  [ARM] 4519/1: S3C: split S3C2400 values out of S3C24XX map.h
  [ARM] 4518/1: S3C: Rename watchdog configuration options
  [ARM] 4517/1: S3C: Fix debug macros for ARM926 output
  [ARM] 4516/1: S3C: Fix uncompressor serial output for ARM926
  [ARM] 4515/1: S3C: Move uncompress code to plat-s3c
  [ARM] 4514/1: S3C: Rename DEBUG_S3C2410_PORT and DEBUG_S3C_UART
  [ARM] 4513/1: S3C: Rename CONFIG_S3C2410_LOWLEVEL_UART_PORT
  [ARM] 4512/1: S3C: rename the debug macros for per-cpu updates
  [ARM] 4511/1: S3C: updated LLSERIAL Kconfig defines for CPU support
  [ARM] 4510/1: S3C: split debug-macro support into plat-s3c
  [ARM] 4509/1: S3C: Create initial arch/arm/plat-s3c
  [ARM] 4508/1: S3C: Move items to include/asm-arm/plat-s3c
  [ARM] 4461/1: MXC platform and i.MX31ADS core support
  [ARM] 4507/1: pxa2xx clock_event_device
  [ARM] 4497/1: Only allow safe cache configurations on ARMv6 and later
  ...

diff --combined MAINTAINERS
index a9b9ef614ae7d602c05bad2b101583fe8e6a019a,57c07c20af40e4a50d0d034b7f3ad90ce0638aae..01f222e51871ba1ed86465119e2329ba74e7afb1
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -225,15 -225,15 +225,15 @@@ T:      git kernel.org:/pub/scm/linux/kernel
  S:    Supported
  
  ACPI BATTERY DRIVERS
 -P:    Vladimir P. Lebedev
 -M:    vladimir.p.lebedev@intel.com
 +P:    Alexey Starikovskiy
 +M:    astarikovskiy@suse.de
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
  
  ACPI EC DRIVER
  P:    Alexey Starikovskiy
 -M:    alexey.y.starikovskiy@linux.intel.com
 +M:    astarikovskiy@suse.de
  L:    linux-acpi@vger.kernel.org
  W:    http://acpi.sourceforge.net/
  S:    Supported
@@@ -329,12 -329,6 +329,12 @@@ P:       Ivan Kokshaysk
  M:    ink@jurassic.park.msu.ru
  S:    Maintained for 2.4; PCI support for 2.6.
  
 +AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 +P:    Thomas Dahlmann
 +M:    thomas.dahlmann@amd.com
 +L:    info-linux@geode.amd.com
 +S:    Supported
 +
  AMD GEODE PROCESSOR/CHIPSET SUPPORT
  P:    Jordan Crouse
  M:    info-linux@geode.amd.com
@@@ -463,7 -457,7 +463,7 @@@ S: Maintaine
  
  ARM/HP JORNADA 7XX MACHINE SUPPORT
  P:      Kristoffer Ericson
- M:      kristoffer_e1@hotmail.com
+ M:      kristoffer.ericson@gmail.com
  W:      www.jlime.com
  S:      Maintained
  
@@@ -651,12 -645,7 +651,12 @@@ W:       http://linux-atm.sourceforge.ne
  S:    Maintained
  
  ATMEL AT91 MCI DRIVER
 -S:    Orphan
 +P:    Nicolas Ferre
 +M:    nicolas.ferre@rfo.atmel.com
 +L:    linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 +W:    http://www.atmel.com/products/AT91/
 +W:    http://www.at91.com/
 +S:    Maintained
  
  ATMEL MACB ETHERNET DRIVER
  P:    Haavard Skinnemoen

diff --combined arch/arm/mach-ixp4xx/common.c
index 23e7fba6d3e1ff31131854fcec2bec97a8c9a983,4c54a86eda3a787a544e0e3d63aae127e5232c51..c1271c449246ecf743d6bdce0e77e052ad1e74a1
--- 1/arch/arm/mach-ixp4xx/common.c
--- 2/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@@ -188,7 -188,7 +188,7 @@@ static int ixp4xx_set_irq_type(unsigne
        *int_reg |= (int_style << (line * IXP4XX_GPIO_STYLE_SIZE));
  
        /* Configure the line as an input */
-       gpio_line_config(line, IXP4XX_GPIO_IN);
+       gpio_line_config(irq2gpio[irq], IXP4XX_GPIO_IN);
  
        return 0;
  }
@@@ -459,8 -459,6 +459,8 @@@ static void ixp4xx_set_mode(enum clock_
        default:
                osrt = opts = 0;
                break;
 +      case CLOCK_EVT_MODE_RESUME:
 +              break;
        }
  
        *IXP4XX_OSRT1 = osrt | opts;

diff --combined drivers/char/watchdog/Kconfig
index ad5cc5f6862fdff08746a91d5068dad490124c8b,a4d81cda479efb3426b0600776fd46d110a411a9..16fb23125e96acdab10d128adda7181830fd93ea
--- 1/drivers/char/watchdog/Kconfig
--- 2/drivers/char/watchdog/Kconfig
+++ b/drivers/char/watchdog/Kconfig
@@@ -187,6 -187,22 +187,22 @@@ config PNX4008_WATCHDO
  
          Say N if you are unsure.
  
+ config IOP_WATCHDOG
+       tristate "IOP Watchdog"
+       depends on WATCHDOG && PLAT_IOP
+       select WATCHDOG_NOWAYOUT if (ARCH_IOP32X || ARCH_IOP33X)
+       help
+         Say Y here if to include support for the watchdog timer
+         in the Intel IOP3XX & IOP13XX I/O Processors.  This driver can
+         be built as a module by choosing M. The module will
+         be called iop_wdt.
+ 
+         Note: The IOP13XX watchdog does an Internal Bus Reset which will
+         affect both cores and the peripherals of the IOP.  The ATU-X
+         and/or ATUe configuration registers will remain intact, but if
+         operating as an Root Complex and/or Central Resource, the PCI-X
+         and/or PCIe busses will also be reset.  THIS IS A VERY BIG HAMMER.
+ 
  # AVR32 Architecture
  
  config AT32AP700X_WDT
@@@ -602,7 -618,7 +618,7 @@@ config ZVM_WATCHDO
  
  config SH_WDT
        tristate "SuperH Watchdog"
 -      depends on SUPERH
 +      depends on SUPERH && (CPU_SH3 || CPU_SH4)
        help
          This driver adds watchdog support for the integrated watchdog in the
          SuperH processors. If you have one of these processors and wish