summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-07-03 17:13:28 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-07-03 17:13:28 +0200
commit946e2ad040000a14b7316fae722e7e65fa09ffe5 (patch)
tree6bc244a1c49221335e14bf795403debf6f24712d /sound
parentLinux 2.6.26-rc8 (diff)
parent[ARM] 5015/1: arm: remove ARCH_CO285 (diff)
downloadlinux-946e2ad040000a14b7316fae722e7e65fa09ffe5.tar.xz
linux-946e2ad040000a14b7316fae722e7e65fa09ffe5.zip
Merge branch 'fb' into devel
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions