Merge for-next omap-testing cbus
authorTony Lindgren <tony@atomide.com>
Fri, 28 Jan 2011 01:36:25 +0000 (17:36 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 28 Jan 2011 01:36:25 +0000 (17:36 -0800)

Trivial merge