Merge current mainline tree into linux-omap tree

author Tony Lindgren <tony@atomide.com>

Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)

committer Tony Lindgren <tony@atomide.com>

Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
author Tony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
committer Tony Lindgren <tony@atomide.com>
Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
diff --cc drivers/net/smc911x.c
Simple merge
diff --cc drivers/net/smc91x.c
Simple merge
diff --cc drivers/rtc/Kconfig
Simple merge
diff --cc drivers/rtc/Makefile
Simple merge
author	Tony Lindgren <tony@atomide.com>
	Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
committer	Tony Lindgren <tony@atomide.com>
	Mon, 23 Jun 2008 07:41:18 +0000 (10:41 +0300)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc911x.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/net/smc91x.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/rtc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history