Merge branches 'sg_aess_reset_devel_3.9' and 'omap4_pm_fixes_a_3.9' into omap4_prcm_d...
authorPaul Walmsley <paul@pwsan.com>
Sun, 10 Feb 2013 18:27:02 +0000 (11:27 -0700)
committerPaul Walmsley <paul@pwsan.com>
Sun, 10 Feb 2013 18:27:02 +0000 (11:27 -0700)

Trivial merge