]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
committerTony Lindgren <tony@atomide.com>
Tue, 7 Oct 2008 11:27:17 +0000 (14:27 +0300)
Merge branches 'master' and 'linus'

1  2 
Makefile
drivers/mfd/Kconfig

diff --cc Makefile
Simple merge
Simple merge