Merge omap-mirror/p-jb-mr1-release into omap-mirror/d-jb-mr1-release
authorRoman Shaposhnikov <x0166637@ti.com>
Mon, 11 Feb 2013 17:55:43 +0000 (11:55 -0600)
committerRoman Shaposhnikov <x0166637@ti.com>
Mon, 11 Feb 2013 17:55:43 +0000 (11:55 -0600)

Trivial merge