diff options
| author | Linus Torvalds <[email protected]> | 2010-03-29 16:12:14 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2010-03-29 16:12:14 +0000 |
| commit | 376a21ff42ba71167afe7a47aeb1ca19470cf580 (patch) | |
| tree | 0a523c3e84e7180547f54df615ca20e4e5293045 /net/unix/sysctl_net_unix.c | |
| parent | Staging: et131x: Properly disable FC in txmac. (diff) | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| download | kernel-376a21ff42ba71167afe7a47aeb1ca19470cf580.tar.gz kernel-376a21ff42ba71167afe7a47aeb1ca19470cf580.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:
ALSA: hda: Use LPIB for ga-ma770-ud3 board
ALSA: ac97: Add Toshiba P500 to ac97 jack sense blacklist
ALSA: pcm_lib - fix xrun functionality
ALSA: ac97: Add IBM ThinkPad R40e to Headphone/Line Jack Sense blacklist
ALSA: hda - Don't set invalid connection index in Realtek initialiaiton
Diffstat (limited to 'net/unix/sysctl_net_unix.c')
0 files changed, 0 insertions, 0 deletions