summaryrefslogtreecommitdiffstats
path: root/sound/oss/msnd_pinnacle.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-12-28 20:19:47 -0800
committerDavid S. Miller <davem@davemloft.net>2008-12-28 20:19:47 -0800
commite3c6d4ee545e427b55882d97d3b663c6411645fe (patch)
tree294326663fb757739a98083c2ddd570d1eaf7337 /sound/oss/msnd_pinnacle.h
parent5bc053089376217943187ed5153d0d1e5c5085b6 (diff)
parent3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff)
downloadlinux-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.gz
linux-e3c6d4ee545e427b55882d97d3b663c6411645fe.tar.bz2
linux-e3c6d4ee545e427b55882d97d3b663c6411645fe.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: arch/sparc64/kernel/idprom.c
Diffstat (limited to 'sound/oss/msnd_pinnacle.h')
0 files changed, 0 insertions, 0 deletions