summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-07-10 05:44:23 -0600
committerPaul Walmsley <paul@pwsan.com>2011-07-10 05:44:23 -0600
commitc84584139aaeef7631df152e13cbf319d8e55950 (patch)
tree87c7a6e9396aac16b1bc054c8527951c701dc45b /arch/arm/mach-omap2
parent9a2a3603cf1c57ed21adb045a771405ab27335c1 (diff)
parenta57341f780660800e1463eaedb80ed152ad6b5de (diff)
parent6d3c55fd4f0f94a9455d30df9414ddb0f755f402 (diff)
downloadblackbird-op-linux-c84584139aaeef7631df152e13cbf319d8e55950.tar.gz
blackbird-op-linux-c84584139aaeef7631df152e13cbf319d8e55950.zip
Merge branches 'powerdomain_fixes_3.1', 'hardware_workarounds_3.1', 'hwmod_dss_fix_3.1' and 'i2c_fixes_3.1' into prcm-fixes-3.1
OpenPOWER on IntegriCloud