aboutsummaryrefslogtreecommitdiff
path: root/fs/nfsd
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-11-12 10:42:38 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-11-12 10:42:38 -0800
commit504765f3b020f15e88bc1334d5b3e0a6e849b1cd (patch)
treed1a0617539432a615db67f7a2deae2cf2c18417c /fs/nfsd
parent58a47481b6ecb6dd05ab4a788e1f2ae3c7c46f57 (diff)
parent24924f884cd36603615ea5496244e542b0b513c6 (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 IDT/STAC multiple HP detection ALSA: hda - Fix input pin initialization for STAC/IDT codecs ALSA: hda - Add missing analog-mux mixer creation for STAC9200
Diffstat (limited to 'fs/nfsd')
0 files changed, 0 insertions, 0 deletions