Merge current mainline tree into linux-omap tree
authorTony Lindgren <tony@atomide.com>
Wed, 5 Mar 2008 08:33:15 +0000 (10:33 +0200)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Mar 2008 08:33:15 +0000 (10:33 +0200)
Merge branches 'master' and 'linus'

Conflicts:

drivers/rtc/Kconfig


Trivial merge