Merge tag 'omap-fixes-b2-for-3.7-rc' of git://git.kernel.org/pub/scm/linux/kernel...
authorTony Lindgren <tony@atomide.com>
Tue, 6 Nov 2012 17:55:20 +0000 (09:55 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 6 Nov 2012 17:55:20 +0000 (09:55 -0800)

Trivial merge