summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-01 19:57:12 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-01 19:57:12 +0100
commitab658321f32770b903a4426e2a6fae0392757755 (patch)
treec53ceda3114feafe3097cff0061f404884ea19a0 /arch/x86/kernel/Makefile
parentMerge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/air... (diff)
parentMerge branch 'fix/asoc' into for-linus (diff)
downloadlinux-ab658321f32770b903a4426e2a6fae0392757755.tar.xz
linux-ab658321f32770b903a4426e2a6fae0392757755.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ASoC: AM3517: ASoC driver not getting compiled ASoC: AIC23: Fixing writes to non-existing registers in resume function ALSA: hda - Add an ASUS mobo to MSI blacklist
Diffstat (limited to 'arch/x86/kernel/Makefile')
0 files changed, 0 insertions, 0 deletions