Merge Linus' latest into master

Conflicts:

	drivers/watchdog/at91rm9200_wdt.c
	drivers/watchdog/davinci_wdt.c
	drivers/watchdog/ep93xx_wdt.c
	drivers/watchdog/ixp2000_wdt.c
	drivers/watchdog/ixp4xx_wdt.c
	drivers/watchdog/ks8695_wdt.c
	drivers/watchdog/omap_wdt.c
	drivers/watchdog/pnx4008_wdt.c
	drivers/watchdog/sa1100_wdt.c
	drivers/watchdog/wdt285.c

diff --cc drivers/media/video/pxa_camera.c
Simple merge

diff --cc drivers/watchdog/at91rm9200_wdt.c
index bf872aa,2313f44..bacd867
--- 1/drivers/watchdog/at91rm9200_wdt.c
--- 2/drivers/watchdog/at91rm9200_wdt.c
+++ b/drivers/watchdog/at91rm9200_wdt.c
@@@ -20,10 -20,10 +20,9 @@@
  #include <linux/platform_device.h>
  #include <linux/types.h>
  #include <linux/watchdog.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
 -#include <asm/arch/at91_st.h>
 -
 +#include <mach/at91_st.h>
  
- 
  #define WDT_DEFAULT_TIME      5       /* seconds */
  #define WDT_MAX_TIME          256     /* seconds */
  

diff --cc drivers/watchdog/davinci_wdt.c
index 003dffe,802aeba..2e13602
--- 1/drivers/watchdog/davinci_wdt.c
--- 2/drivers/watchdog/davinci_wdt.c
+++ b/drivers/watchdog/davinci_wdt.c
@@@ -22,10 -22,10 +22,9 @@@
  #include <linux/bitops.h>
  #include <linux/platform_device.h>
  #include <linux/spinlock.h>
- 
+ #include <linux/uaccess.h>
+ #include <linux/io.h>
 -
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
- #include <asm/io.h>
  
  #define MODULE_NAME "DAVINCI-WDT: "
  

diff --cc drivers/watchdog/ep93xx_wdt.c
index af8ef14,07b74a7..e9f950f
--- 1/drivers/watchdog/ep93xx_wdt.c
--- 2/drivers/watchdog/ep93xx_wdt.c
+++ b/drivers/watchdog/ep93xx_wdt.c
@@@ -28,9 -28,9 +28,8 @@@
  #include <linux/miscdevice.h>
  #include <linux/watchdog.h>
  #include <linux/timer.h>
- 
+ #include <linux/uaccess.h>
 -
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
  
  #define WDT_VERSION   "0.3"
  #define PFX           "ep93xx_wdt: "

diff --cc drivers/watchdog/iop_wdt.c
Simple merge

diff --cc drivers/watchdog/ixp2000_wdt.c
index 4226dae,a77f69d..4f4b35a
--- 1/drivers/watchdog/ixp2000_wdt.c
--- 2/drivers/watchdog/ixp2000_wdt.c
+++ b/drivers/watchdog/ixp2000_wdt.c
@@@ -25,9 -25,9 +25,8 @@@
  #include <linux/watchdog.h>
  #include <linux/init.h>
  #include <linux/bitops.h>
- 
+ #include <linux/uaccess.h>
 -
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
  
  static int nowayout = WATCHDOG_NOWAYOUT;
  static unsigned int heartbeat = 60;   /* (secs) Default is 1 minute */

diff --cc drivers/watchdog/ixp4xx_wdt.c
index 2313fad,ef3157d..41264a5
--- 1/drivers/watchdog/ixp4xx_wdt.c
--- 2/drivers/watchdog/ixp4xx_wdt.c
+++ b/drivers/watchdog/ixp4xx_wdt.c
@@@ -22,9 -22,9 +22,8 @@@
  #include <linux/watchdog.h>
  #include <linux/init.h>
  #include <linux/bitops.h>
- 
+ #include <linux/uaccess.h>
 -
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
  
  static int nowayout = WATCHDOG_NOWAYOUT;
  static int heartbeat = 60;    /* (secs) Default is 1 minute */

diff --cc drivers/watchdog/ks8695_wdt.c
index d21a640,f8566d5..0b798fd
--- 1/drivers/watchdog/ks8695_wdt.c
--- 2/drivers/watchdog/ks8695_wdt.c
+++ b/drivers/watchdog/ks8695_wdt.c
@@@ -19,11 -19,11 +19,10 @@@
  #include <linux/platform_device.h>
  #include <linux/types.h>
  #include <linux/watchdog.h>
- #include <asm/io.h>
- #include <asm/uaccess.h>
+ #include <linux/io.h>
+ #include <linux/uaccess.h>
 -#include <asm/arch/regs-timer.h>
 -
 +#include <mach/regs-timer.h>
  
- 
  #define WDT_DEFAULT_TIME      5       /* seconds */
  #define WDT_MAX_TIME          171     /* seconds */
  

diff --cc drivers/watchdog/omap_wdt.c
index 74a10d5,6f5420f..3a11dad
--- 1/drivers/watchdog/omap_wdt.c
--- 2/drivers/watchdog/omap_wdt.c
+++ b/drivers/watchdog/omap_wdt.c
@@@ -40,12 -40,11 +40,10 @@@
  #include <linux/moduleparam.h>
  #include <linux/clk.h>
  #include <linux/bitops.h>
- 
- #include <asm/io.h>
- #include <asm/uaccess.h>
+ #include <linux/io.h>
+ #include <linux/uaccess.h>
 -#include <linux/hardware.h>
 -
 -#include <asm/arch/prcm.h>
 +#include <mach/hardware.h>
- 
 +#include <mach/prcm.h>
  
  #include "omap_wdt.h"
  

diff --cc drivers/watchdog/pnx4008_wdt.c
index f431a04,6eadf5e..0ed8416
--- 1/drivers/watchdog/pnx4008_wdt.c
--- 2/drivers/watchdog/pnx4008_wdt.c
+++ b/drivers/watchdog/pnx4008_wdt.c
@@@ -28,10 -28,10 +28,9 @@@
  #include <linux/platform_device.h>
  #include <linux/clk.h>
  #include <linux/spinlock.h>
- 
+ #include <linux/uaccess.h>
+ #include <linux/io.h>
 -
 -#include <asm/hardware.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
- #include <asm/io.h>
  
  #define MODULE_NAME "PNX4008-WDT: "
  

diff --cc drivers/watchdog/s3c2410_wdt.c
Simple merge

diff --cc drivers/watchdog/sa1100_wdt.c
index 97d9da7,27d6898..31a4843
--- 1/drivers/watchdog/sa1100_wdt.c
--- 2/drivers/watchdog/sa1100_wdt.c
+++ b/drivers/watchdog/sa1100_wdt.c
@@@ -26,14 -26,13 +26,14 @@@
  #include <linux/watchdog.h>
  #include <linux/init.h>
  #include <linux/bitops.h>
+ #include <linux/uaccess.h>
  
  #ifdef CONFIG_ARCH_PXA
 -#include <asm/arch/pxa-regs.h>
 +#include <mach/pxa-regs.h>
  #endif
  
 -#include <asm/hardware.h>
 +#include <mach/reset.h>
 +#include <mach/hardware.h>
- #include <asm/uaccess.h>
  
  #define OSCR_FREQ             CLOCK_TICK_RATE
  

diff --cc drivers/watchdog/wdt285.c
index 94e2d91,fea398a..c8d7f1b
--- 1/drivers/watchdog/wdt285.c
--- 2/drivers/watchdog/wdt285.c
+++ b/drivers/watchdog/wdt285.c
@@@ -26,10 -26,10 +26,10 @@@
  #include <linux/reboot.h>
  #include <linux/init.h>
  #include <linux/interrupt.h>
- 
- #include <asm/irq.h>
- #include <asm/uaccess.h>
+ #include <linux/uaccess.h>
+ #include <linux/irq.h>
 +#include <mach/hardware.h>
+ 
 -#include <asm/hardware.h>
  #include <asm/mach-types.h>
  #include <asm/hardware/dec21285.h>