summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-27 13:39:43 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-27 13:39:43 +0100
commit31bccbf39208133415000520c79ebe7b291786df (patch)
treee03b799594ec22613ca2eb7382fc0a98e0cd4b0f /kernel
parentMerge branches 'core' and 'clks' into devel (diff)
parent[ARM] clps7500: remove support (diff)
downloadlinux-31bccbf39208133415000520c79ebe7b291786df.tar.xz
linux-31bccbf39208133415000520c79ebe7b291786df.zip
Merge branch 'clps7500' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions