]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
projects / linux-2.6-omap-h63xx.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f620756 3de2403)
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)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
drivers/usb/host/Kconfig patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc drivers/usb/host/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.