omap: Changes to avoid merge conflicts with MFD tree
authorTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 02:54:25 +0000 (18:54 -0800)
committerTony Lindgren <tony@atomide.com>
Sat, 14 Nov 2009 02:54:25 +0000 (18:54 -0800)
This will be reverted as a fix after the merge window.

Signed-off-by: Tony Lindgren <tony@atomide.com>

No differences found