Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'

Conflicts:

	drivers/usb/gadget/omap_udc.c
	drivers/usb/musb/Kconfig
	drivers/usb/musb/Makefile
	drivers/usb/musb/cppi_dma.c
	drivers/usb/musb/davinci.c
	drivers/usb/musb/musb_core.c
	drivers/usb/musb/musb_core.h
	drivers/usb/musb/musb_debug.h
	drivers/usb/musb/musb_gadget.c
	drivers/usb/musb/musb_gadget_ep0.c
	drivers/usb/musb/musb_host.c
	drivers/usb/musb/musbhsdma.c
	drivers/usb/musb/omap2430.c
	drivers/usb/musb/omap2430.h
	drivers/usb/musb/tusb6010.c
	drivers/usb/musb/tusb6010_omap.c

diff --cc Makefile
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/plat-omap/include/mach/memory.h
Simple merge

diff --cc drivers/bluetooth/Kconfig
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/i2c/chips/isp1301_omap.c
index 28902ebd553905aedd2507d32870d97ea7023ade,4655b794ebe3c7d06ad911cf898c25a5061b03d0..f717270993318ad8b47f6aba9861157f13c11d27
--- 1/drivers/i2c/chips/isp1301_omap.c
--- 2/drivers/i2c/chips/isp1301_omap.c
+++ b/drivers/i2c/chips/isp1301_omap.c
@@@ -31,6 -31,6 +31,7 @@@
  #include <linux/usb/otg.h>
  #include <linux/i2c.h>
  #include <linux/workqueue.h>
++#include <linux/io.h>
  
  #include <asm/irq.h>
  #include <mach/usb.h>

diff --cc drivers/input/touchscreen/Kconfig
Simple merge

diff --cc drivers/net/Kconfig
Simple merge

diff --cc drivers/net/smc91x.c
Simple merge

diff --cc drivers/rtc/Kconfig
Simple merge

diff --cc drivers/usb/Kconfig
Simple merge

diff --cc drivers/usb/gadget/omap_udc.c
index a2638eeecca96b3fb3ad16cfec255901cbfd400e,574c53831a05fd17afd6062633aaab4843609e5f..4596154398d7c7ef087c51d68f703343c6dc0fe6
--- 1/drivers/usb/gadget/omap_udc.c
--- 2/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@@ -2310,17 -2311,10 +2311,17 @@@ static int proc_otg_show(struct seq_fil
        u32             trans;
        char            *ctrl_name;
  
-       tmp = omap_readw(OTG_REV);
+       tmp = omap_readl(OTG_REV);
        if (cpu_is_omap24xx()) {
 +              /*
 +               * REVISIT: Not clear how this works on OMAP2.  trans
 +               * is ANDed to produce bits 7 and 8, which might make
 +               * sense for USB_TRANSCEIVER_CTRL on OMAP1,
 +               * but with CONTROL_DEVCONF, these bits have something to
 +               * do with the frame adjustment counter and McBSP2.
 +               */
                ctrl_name = "control_devconf";
-               trans = omap_ctrl_readb(OMAP2_CONTROL_DEVCONF0);
+               trans = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
        } else {
                ctrl_name = "tranceiver_ctrl";
                trans = omap_readw(USB_TRANSCEIVER_CTRL);

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

diff --cc drivers/watchdog/Kconfig
Simple merge