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

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (42 commits)
  [ARM] Fix tosa build error
  [ARM] 3610/1: Make reboot work on Versatile
  [ARM] 3609/1: S3C24XX: defconfig update for s3c2410_defconfig
  [ARM] 3591/1: Anubis: IDE device definitions
  [ARM] Include asm/hardware.h not asm/arch/hardware.h
  [ARM] 3594/1: Poodle: Add touchscreen support + other updates
  [ARM] 3564/1: sharpsl_pm: Abstract some machine specific parameters
  [ARM] 3561/1: Poodle: Correct the MMC/SD power control
  [ARM] 3593/1: Add reboot and shutdown handlers for Zaurus handhelds
  [ARM] 3599/1: AT91RM9200 remove global variables
  [ARM] 3607/1: AT91RM9200 misc fixes
  [ARM] 3605/1: AT91RM9200 Power Management
  [ARM] 3604/1: AT91RM9200 New boards
  [ARM] 3603/1: AT91RM9200 remove old files
  [ARM] 3592/1: AT91RM9200 Serial driver update
  [ARM] 3590/1: AT91RM9200 Platform devices support
  [ARM] 3589/1: AT91RM9200 DK/EK board update
  [ARM] 3588/1: AT91RM9200 CSB337/637 board update
  [ARM] 3587/1: AT91RM9200 hardware headers
  [ARM] 3586/1: AT91RM9200 header update
  ...

diff --cc include/asm-arm/arch-pxa/pxa-regs.h
Simple merge

diff --cc include/asm-arm/mach/serial_at91.h
index 0000000,18bc4e0..1290bb3
mode 000000,100644..100644
--- /dev/null
--- 2/include/asm-arm/mach/serial_at91.h
+++ b/include/asm-arm/mach/serial_at91.h
@@@ -1,0 -1,34 +1,33 @@@
 -#include <linux/config.h>
+ /*
+  *  linux/include/asm-arm/mach/serial_at91.h
+  *
+  *  Based on serial_sa1100.h  by Nicolas Pitre
+  *
+  *  Copyright (C) 2002 ATMEL Rousset
+  *
+  *  Low level machine dependent UART functions.
+  */
+ 
+ struct uart_port;
+ 
+ /*
+  * This is a temporary structure for registering these
+  * functions; it is intended to be discarded after boot.
+  */
+ struct at91_port_fns {
+       void    (*set_mctrl)(struct uart_port *, u_int);
+       u_int   (*get_mctrl)(struct uart_port *);
+       void    (*enable_ms)(struct uart_port *);
+       void    (*pm)(struct uart_port *, u_int, u_int);
+       int     (*set_wake)(struct uart_port *, u_int);
+       int     (*open)(struct uart_port *);
+       void    (*close)(struct uart_port *);
+ };
+ 
+ #if defined(CONFIG_SERIAL_AT91)
+ void at91_register_uart_fns(struct at91_port_fns *fns);
+ #else
+ #define at91_register_uart_fns(fns) do { } while (0)
+ #endif
+ 
+ 

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

diff --cc include/linux/serial_core.h
Simple merge