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 bf872aa2b9f3cd66aee23574f42a425b54d7d1f1,2313f44144f8dcb42f9cde5f4baf09138e410792..bacd867dd22e4c36e56353cff77d2401666eb370
--- 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 003dffe5cb19b6e0f9031cd6de420fa705ac7d30,802aeba347a062321233abcfa936c219dcd4c4d6..2e1360286732c8e3ca10ea93c25721e4ead43560
--- 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 af8ef14c0e4ce784078b61f7766d4ca7beaff390,07b74a768922b8e2a5a7619d283aa37fbf558997..e9f950ff86eaee3e685bd35b4eb9c17221da4cde
--- 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 4226dae7d26016877ea9167675093ac4d66f9552,a77f69d528779663710b07f4d89f53271a688056..4f4b35a20d84ed6642fb789b49e6c601b8742d86
--- 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 2313fad0dbb11091f9aee5557aa587e1d7ae0c81,ef3157dc9ac1349329563027df8fe21a0f894ba2..41264a5f173121c836f73a7ac4d778ff109c2a86
--- 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 d21a6407fe2136d0dc42dc7173d0e8142c461384,f8566d5c62fe71da13fb20961d59d160d9219569..0b798fdaa378eccd53e39c5ab1fa538e19388b03
--- 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 74a10d50607bd557acfacbbdcfb65e23d9e2e06d,6f5420f478a989b9fbd1ffd74415956a1c5e087c..3a11dadfd8e7dba34103f9d9b8685648e14a6f31
--- 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 f431a0427eaa1c91cd238abbc6866ca2fcbf96a4,6eadf5ebb9b34ea647891b5c0da9a21a1463c0d3..0ed84162437beb913a66cdf621bde5e0d2bc9a38
--- 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 97d9da758dccd7a0977ffea9d93ec0938f4b749b,27d6898a7c983f8f987a6dc584be8ea4f099b160..31a48437dc3dba2ce22ba5ae8aef3ce72d1b7c71
--- 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 94e2d91c9ac97806e2b1904db1dc7badd41c9b3f,fea398a4ca327189cce6d6b669f03be4cd2b29af..c8d7f1b2df026ccac80f2862667fe14a29466667
--- 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>