diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 15:16:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-25 15:16:18 -0800 |
| commit | 169d418b127b98a3e464e9c4b807ad083760f98c (patch) | |
| tree | a63dd104252b1863e3ff49991a406a9d19582e83 /net/ipv4/xfrm4_mode_tunnel.c | |
| parent | 70c01f01a214d9cc2e5a96ac43941f48a200f53f (diff) | |
| parent | 1440566f2db470eddc58dc35025ccaeb0a52558a (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: emu10k1 - Fix digital/analog switch on audigy2 ZS
ALSA: hda - Quirk for Acer Aspire 6530G
ALSA: hda - add another MacBook Pro 3,1 SSID
ALSA: fix excessive background noise introduced by OSS emulation rate shrink
ALSA: aw2: do not grab every saa7146 based device
ALSA: hda - Fix parse of init_verbs sysfs entry
ALSA: pcxhr.h replace signed one-bit bitfields
Diffstat (limited to 'net/ipv4/xfrm4_mode_tunnel.c')
0 files changed, 0 insertions, 0 deletions