Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)

committer Tony Lindgren <tony@atomide.com>

Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
author Tony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
committer Tony Lindgren <tony@atomide.com>
Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
diff --cc Makefile
Simple merge
diff --cc drivers/usb/gadget/Kconfig
Simple merge
diff --cc drivers/usb/host/ehci-hcd.c
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
committer	Tony Lindgren <tony@atomide.com>
	Tue, 11 Mar 2008 15:08:41 +0000 (17:08 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/gadget/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/usb/host/ehci-hcd.c	patch \|	diff1 \|	diff2 \|	blob \| history