aboutsummaryrefslogtreecommitdiff
path: root/sound/arm/aaci.h
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2007-02-18 11:27:07 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-02-18 11:27:07 +0000
commit8213084125eed3c5efbc5e13739b93dfedb88590 (patch)
treeb98d91de82a4a39a47c6031832271341ecf5e8e0 /sound/arm/aaci.h
parent66822b2eef8de9fe3ec9fa837386817565dbe690 (diff)
parentb77bfa84c419e3ec8b8e3fd4b4579e5761b7c943 (diff)
downloadlinux-8213084125eed3c5efbc5e13739b93dfedb88590.tar.gz
Merge NetSilicon NS93xx tree
Fixed conflicts: arch/arm/Makefile arch/arm/mm/Kconfig Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/arm/aaci.h')
0 files changed, 0 insertions, 0 deletions