git.karo-electronics.de Git - karo-tx-linux.git/commit

]> git.karo-electronics.de Git - karo-tx-linux.git/commit

projects / karo-tx-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 1c2c9b6 e387ef5)

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:06:53 +0000 (12:06 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 25 Jul 2012 02:06:53 +0000 (12:06 +1000)
commit	e1ce3ad17eda79f1ef2a79dbfa0264d10270f9b3
tree	230520f1698ce1d87f7dfb0c2a3ca6b16232aac0	tree \| snapshot
parent	1c2c9b6f59d74cb43f75cacb6cf8637184bc3128	commit \| diff
parent	e387ef5c47ddeaeaa3cbdc54424cdb7a28dae2c0	commit \| diff

Merge remote-tracking branch 'usb/usb-next'

Conflicts:
include/scsi/scsi_device.h

16 files changed:

arch/arm/mach-omap2/clock3xxx_data.c	diff1 \|	diff2 \|	blob \| history
drivers/power/pda_power.c	diff1 \|	diff2 \|	blob \| history
drivers/power/twl4030_charger.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/class/cdc-acm.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/omap_udc.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/u_ether.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/Kconfig	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-tegra.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ohci-omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/otg/isp1301_omap.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/renesas_usbhs/fifo.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/keyspan.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/quatech2.c	diff1 \|	diff2 \|	blob \| history
drivers/usb/serial/sierra.c	diff1 \|	diff2 \|	blob \| history

Linux kernel for KaRo TX COM modules