aboutsummaryrefslogtreecommitdiff
path: root/net/netfilter/nf_conntrack_netlink.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-09 12:14:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-09 12:14:23 -0800
commitc447064de46a942e2d91a4cf22afa70538d781dd (patch)
tree4ed061014fac9cdbec9314afd4313f19e1be307a /net/netfilter/nf_conntrack_netlink.c
parent8cd5c8661df33674daa67bf552a73497eeeba710 (diff)
parent8de5d6f19bbe7c77676a62ab52be901aa10d6b54 (diff)
Merge tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "Nothing exciting here: just a few regression fixes for HD-audio and ASoC, also the support of missing 32bit compat ioctl for HDSPM." * tag 'sound-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: hdspm - Provide ioctl_compat ALSA: hda/realtek - Apply the coef-setup only to ALC269VB ALSA: hda - add quirk to detect CD input on Gigabyte EP45-DS3 ASoC: neo1973: fix neo1973 wm8753 initialization
Diffstat (limited to 'net/netfilter/nf_conntrack_netlink.c')
0 files changed, 0 insertions, 0 deletions