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)
commit6a32eb134fbf2ea1d384e0bfa8e9ba6eec952817
treec4328748d41611fba6ec85ae07f7d549a76a0bcb
parent5b97d3ec6732c87741b2fc04f2956f097a458818
parentd70ac829b7f42d7ef4f879635c6a772b0b4ed0a2
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
MAINTAINERS
Makefile
drivers/net/smc911x.c
drivers/net/smc91x.c
drivers/rtc/Kconfig
drivers/rtc/Makefile