summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorPaul Walmsley <paul@pwsan.com>2011-07-10 13:44:23 +0200
committerPaul Walmsley <paul@pwsan.com>2011-07-10 13:44:23 +0200
commitc84584139aaeef7631df152e13cbf319d8e55950 (patch)
tree87c7a6e9396aac16b1bc054c8527951c701dc45b /arch
parentOMAP4: powerdomain data: Fix core mem states and missing cefuse flag (diff)
parentOMAP4: powerdomain data: Remove unsupported MPU powerdomain state (diff)
parentOMAP: hwmod: fix the i2c-reset timeout during bootup (diff)
downloadlinux-c84584139aaeef7631df152e13cbf319d8e55950.tar.xz
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