Merge branch 'omap/omap4' into next/pm
authorOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:56:44 +0000 (15:56 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 11 Dec 2011 23:56:44 +0000 (15:56 -0800)
commit05da34d832d404ac9094db57e9295000207c9d62
treed0c60e673e527085aaddd76fb512311aa6159e40
parent5611cc4572e889b62a7b4c72a413536bf6a9c416
parenteb3e1d9ded81a0036bb42b7c771307fa97f03dc9
Merge branch 'omap/omap4' into next/pm