Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
committerTony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
commit9a8ebb58155581139a237bbf8a436a63667ecf09
tree4488877f73cc198f60cc3ae1e750e0b0db43bf53
parent073e5bbfc0bd81cf7c0062a760c925458e23da73
parent2f44bbb495dd3e6d0209eff2257438ab9c570e5b
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
Makefile
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-hcd.c