Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Thu, 8 May 2008 17:50:38 +0000 (10:50 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 8 May 2008 17:50:38 +0000 (10:50 -0700)
commitcb170dcdce58de20b045ae964a4ccfc29aad1647
tree35f9f0838f1e3125011dad1e0452dc4709f84e59
parentf620756fb38895c1095b797f8fdf74243e128a1d
parent3de2403e6659d71b36ec820dc9b942762ddfe6eb
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
drivers/usb/host/Kconfig