Linus Torvalds 5cc1035062 Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6: (141 commits) USB: mct_u232: fix broken close USB: gadget: amd5536udc.c: fix error path USB: imx21-hcd - fix off by one resource size calculation usb: gadget: fix Kconfig warning usb: r8a66597-udc: Add processing when USB was removed. mxc_udc: add workaround for ENGcm09152 for i.MX35 USB: ftdi_sio: add device ids for ScienceScope USB: musb: AM35x: Workaround for fifo read issue USB: musb: add musb support for AM35x USB: AM35x: Add musb support usb: Fix linker errors with CONFIG_PM=n USB: ohci-sh - use resource_size instead of defining its own resource_len macro USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro USB: xhci: Fix compile error when CONFIG_PM=n USB: accept some invalid ep0-maxpacket values USB: xHCI: PCI power management implementation USB: xHCI: bus power management implementation USB: xHCI: port remote wakeup implementation USB: xHCI: port power management implementation ... Manually fix up (non-data) conflict: the SCSI merge gad renamed the 'hw_sector_size' member to 'physical_block_size', and the USB tree brought a new use of it.		2010-10-22 20:30:48 -07:00
..
4xx	powerpc/4xx: Add optional "reset_type" property to control reboot via dts	2010-05-05 12:51:54 -04:00
can	can: sja1000: generic OF platform bus driver	2009-06-01 02:53:35 -07:00
fsl	Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2010-10-22 20:30:48 -07:00
gpio	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-06-28 11:02:32 -07:00
nintendo	powerpc: wii: device tree	2009-12-12 22:24:29 -07:00
ecm.txt	powerpc/85xx: Add binding for LAWs and ECM	2009-05-19 00:46:19 -05:00
marvell.txt	trivial: fix typo "for for" in multiple files	2009-09-21 15:14:54 +02:00
mmc-spi-slot.txt	powerpc: add mmc-spi-slot bindings	2009-04-01 08:59:23 -07:00
mtd-physmap.txt	mtd: maps: add mtd-ram support to physmap_of	2009-09-19 13:15:26 -07:00
phy.txt	powerpc: Refactor device tree binding	2009-06-23 08:09:58 -05:00
spi-bus.txt	powerpc: Refactor device tree binding	2009-06-23 08:09:58 -05:00
usb-ehci.txt	powerpc: Refactor device tree binding	2009-06-23 08:09:58 -05:00
xilinx.txt	Fix comment and Kconfig typos for 'require' and 'fragment'	2010-03-29 15:41:47 +02:00