]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
committerTony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
Merge branches 'master' and 'linus'

1  2 
MAINTAINERS
Makefile
drivers/net/smc911x.c
drivers/net/smc91x.c
drivers/rtc/Kconfig
drivers/rtc/Makefile

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