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)
commit5b99e69f31fa575e53483e1f90c3a88939ca0b95
tree22aec90a6c1648e47e3efe07e42a674c85f49ecb
parentf9ceca72acc061166df583e85deed5dfc1f0d86d
parent4330ed8ed4da360ac1ca14b0fddff4c05b10de16
Merge current mainline tree into linux-omap tree

Merge branches 'master' and 'linus'
Makefile
drivers/mfd/Kconfig