diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:09:51 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:09:51 -0800 |
| commit | 932adbed6d99cc373fc3433d701b3a594fea872c (patch) | |
| tree | d3495817d158f2678c38235b05102ea93d6795be /arch/x86/kernel/nmi.c | |
| parent | ce519e2327bff01d0eb54071e7044e6291a52aa6 (diff) | |
| parent | 167968199089435c63ad1140ccfb8c6179274a0a (diff) | |
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: Fix SND_SOC_ALL_CODECS handling of dual SPI and I2C control buses
ASoC: Use snd_soc_dapm_nc_pin() in at91sam9g20ek
ASoC: TWL4030: Convert the bitfield enums to VALUE_ENUM type
ASoC: New enum type: value_enum
pxa2xx-ac97: switch AC unit to correct state before probing
ASoC: Clocking fixes for davinci-evm.c
ASoC: Mark non-connected TWL4030 pins for pandora
ASoC: OMAP: Select OMAP pin multiplexing when using Nokia N810 ASoC drivers
Diffstat (limited to 'arch/x86/kernel/nmi.c')
0 files changed, 0 insertions, 0 deletions