summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-pxa
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:31:29 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 21:31:29 +0100
commit33b9f582c5c1db515412cc7efff28f7d1779321f (patch)
tree60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/plat-pxa
parent946342d03ec4e8367bba7bb99e7155e97f69058a (diff)
parent008ca431822f39a023322b3598d8366faf46cfc1 (diff)
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/plat-pxa')
0 files changed, 0 insertions, 0 deletions