aboutsummaryrefslogtreecommitdiff
path: root/drivers/pcmcia
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-08-22 08:37:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-22 08:37:45 -0700
commit115399cab1a4a1f54580c4a8c6a24c6cede569b3 (patch)
tree97d9fc5835804b2065d5d01f14f688ab0945cb86 /drivers/pcmcia
parentee26562772f47a6e2030a79b230226b204a410b6 (diff)
parent1082c7487cbe5a40755ba9e33552b6ecbf419bf2 (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: ALSA: hda - Fix call of alc888_coef_init() ALSA: hda_intel: enable snoop for nvidia HDA controller
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions