summaryrefslogtreecommitdiff
path: root/arch/ia64/xen/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-30 05:13:22 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-30 05:13:22 +0300
commit05986e264ee638b6b6151aea89c9f191278c30f1 (patch)
tree783e0de03e1d7aba82f75dc1e42051a42939b82e /arch/ia64/xen/Makefile
parent0d280884961de51afd87465f72ade9e8876d1e26 (diff)
parentde2cf591bc876f7a63809d8955855ab074588c30 (diff)
downloadlinux-05986e264ee638b6b6151aea89c9f191278c30f1.tar.xz
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: OMAP: Initialize XCCR and RCCR registers in McBSP DAI driver ASoC: Fix null string usage with WM8753 DAIs ALSA: hda - add another MacBook Pro 4, 1 subsystem ID ALSA: hda - Fix compile warning with CONFIG_SND_JACK=n ALSA: hda - Add quirk for HP DV6700 laptop ALSA: hda - Fix PCM reference NID for STAC/IDT analog outputs
Diffstat (limited to 'arch/ia64/xen/Makefile')
0 files changed, 0 insertions, 0 deletions