summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2010-08-02 15:50:45 +0100
committerWill Deacon <will.deacon@arm.com>2010-08-02 15:50:45 +0100
commit968a52b3de6348885587d17b9ec01060f9912c43 (patch)
tree180559520dbebf6c7ce4a07db35075a67bdf0aa1 /arch/arm/mach-omap1
parent008d1ab416d999bd843c8d2175f5628b35c2d722 (diff)
parent03d991bdd538a0fc728f41c80683dc346b668fae (diff)
parent708514ae4776a64991f4d1089d38aa9ffc04fa08 (diff)
parentcda96f7b07fcee122ae7c622e67d3be64274b390 (diff)
Merge branches 'atomic-fixes', 'misc-patches', 'perf-probe' and 'sw-breakpoint' into for-linaro