summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-realview
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 22:31:29 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2013-05-02 22:31:29 +0200
commit33b9f582c5c1db515412cc7efff28f7d1779321f (patch)
tree60ea1b403b41f651bc570f4c368ba82064880796 /arch/arm/mach-realview
parentMerge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and 'sm... (diff)
parentARM: EXYNOS: remove unnecessary use of IS_ERR_VALUE() (diff)
downloadlinux-33b9f582c5c1db515412cc7efff28f7d1779321f.tar.xz
linux-33b9f582c5c1db515412cc7efff28f7d1779321f.zip
Merge branch 'cleanup' into for-linus
Conflicts: arch/arm/plat-omap/dmtimer.c
Diffstat (limited to 'arch/arm/mach-realview')
0 files changed, 0 insertions, 0 deletions