summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 19:38:06 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 19:38:06 +0200
commit03347e2592078a90df818670fddf97a33eec70fb (patch)
treefde73020d4bcf7fff0fe083619789bd999f2b24b /sound/oss
parentMerge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/lin... (diff)
parent[IA64] fix compile error in arch/ia64/mm/extable.c (diff)
downloadlinux-03347e2592078a90df818670fddf97a33eec70fb.tar.xz
linux-03347e2592078a90df818670fddf97a33eec70fb.zip
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] fix compile error in arch/ia64/mm/extable.c
Diffstat (limited to 'sound/oss')
0 files changed, 0 insertions, 0 deletions