summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 06:29:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-14 06:29:38 +0100
commit3474cbd11df8cdd6413781ea95bd51dd469098ff (patch)
treec8d78f415c00bad503541bee6dd68055997c3ad7 /sound
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 (diff)
parentsparc64: Add very basic XVR-1000 framebuffer driver. (diff)
downloadlinux-3474cbd11df8cdd6413781ea95bd51dd469098ff.tar.xz
linux-3474cbd11df8cdd6413781ea95bd51dd469098ff.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6: sparc64: Add very basic XVR-1000 framebuffer driver. qlogicpti: Remove slash in QlogicPTI irq name
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions