summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-08-09 14:07:19 +0100
commit2192482ee5ce5d5d4a6cec0c351b2d3a744606eb (patch)
tree15ab3c23d05e98829741b03922b51b81fd102b64 /sound
parent500b9fc922cbec572f4fd1436533bfaed5011262 (diff)
parenta68fefe0d2f364ac3d8497ef37dcad713c261103 (diff)
downloadblackbird-op-linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.tar.gz
blackbird-op-linux-2192482ee5ce5d5d4a6cec0c351b2d3a744606eb.zip
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable
Conflicts: arch/arm/Kconfig
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud