]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
committerTony Lindgren <tony@atomide.com>
Mon, 17 Mar 2008 07:27:24 +0000 (09:27 +0200)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS
Makefile
drivers/misc/Kconfig

diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
Simple merge