summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 21:23:41 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-09-09 21:23:41 +0200
commit93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95 (patch)
treece7e4e6056b575138777793520dded9cb3638056 /sound
parentMerge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 (diff)
parentx86: fix memmap=exactmap boot argument (diff)
downloadlinux-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.tar.xz
linux-93811d94f7e9bcfeed7d6ba75ea5d9c80a70ab95.zip
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: fix memmap=exactmap boot argument x86: disable static NOPLs on 32 bits xen: fix 2.6.27-rc5 xen balloon driver warnings
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions