Merge branch 'omap-fixes-testing'
authorTony Lindgren <tony@atomide.com>
Thu, 1 Oct 2009 20:11:06 +0000 (13:11 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 1 Oct 2009 20:11:06 +0000 (13:11 -0700)
Conflicts:
drivers/mfd/twl4030-core.c


Trivial merge