summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s5p64x0
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 23:05:29 +0100
committerOlof Johansson <olof@lixom.net>2012-03-07 23:05:29 +0100
commit4d02be5a6550ebf09936802c2cb8d359ce1ab29c (patch)
tree11845186f62a45a3809c477ea28daba8d94e0392 /arch/arm/mach-s5p64x0
parentMerge tag 'tegra-cleanups' of git://git.kernel.org/pub/scm/linux/kernel/git/o... (diff)
parentARM: OMAP2+: Fix build error after merge (diff)
downloadlinux-4d02be5a6550ebf09936802c2cb8d359ce1ab29c.tar.xz
linux-4d02be5a6550ebf09936802c2cb8d359ce1ab29c.zip
Merge branch 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
* 'cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: OMAP2+: Fix build error after merge
Diffstat (limited to 'arch/arm/mach-s5p64x0')
0 files changed, 0 insertions, 0 deletions