Merge remote branch 'alsa/devel' into topic/hda

2026-10-14 05:55:17 +00:00 · 2010-03-26 15:28:41 +01:00 · 2010-03-26 15:28:41 +01:00 · 5266874b09
commit 5266874b09
parent 05471e4c44 079e683ebd
56 changed files with 533 additions and 262 deletions
--- a/Documentation/sound/alsa/HD-Audio.txt
+++ b/Documentation/sound/alsa/HD-Audio.txt
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/edac/edac_mce_amd.c
+++ b/drivers/edac/edac_mce_amd.c
--- a/drivers/net/arm/ks8695net.c
+++ b/drivers/net/arm/ks8695net.c
--- a/drivers/net/igb/e1000_82575.c
+++ b/drivers/net/igb/e1000_82575.c
--- a/drivers/net/igb/e1000_hw.h
+++ b/drivers/net/igb/e1000_hw.h
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
--- a/drivers/net/ixgbe/ixgbe_82599.c
+++ b/drivers/net/ixgbe/ixgbe_82599.c
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
--- a/drivers/net/ixgbe/ixgbe_type.h
+++ b/drivers/net/ixgbe/ixgbe_type.h
--- a/drivers/net/ixgbevf/ethtool.c
+++ b/drivers/net/ixgbevf/ethtool.c
--- a/drivers/net/ixgbevf/ixgbevf_main.c
+++ b/drivers/net/ixgbevf/ixgbevf_main.c
--- a/drivers/net/ixgbevf/vf.h
+++ b/drivers/net/ixgbevf/vf.h
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
--- a/drivers/net/ks8851.c
+++ b/drivers/net/ks8851.c
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
--- a/drivers/net/wireless/wl12xx/wl1251_debugfs.c
+++ b/drivers/net/wireless/wl12xx/wl1251_debugfs.c
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
--- a/drivers/vhost/vhost.c
+++ b/drivers/vhost/vhost.c
--- a/fs/afs/security.c
+++ b/fs/afs/security.c
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
--- a/ipc/syscall.c
+++ b/ipc/syscall.c
--- a/net/8021q/vlan_core.c
+++ b/net/8021q/vlan_core.c
--- a/net/bluetooth/hci_sysfs.c
+++ b/net/bluetooth/hci_sysfs.c
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
--- a/net/bluetooth/rfcomm/sock.c
+++ b/net/bluetooth/rfcomm/sock.c
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
--- a/net/core/dev.c
+++ b/net/core/dev.c
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
--- a/net/ipv4/ip_gre.c
+++ b/net/ipv4/ip_gre.c
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
--- a/net/netfilter/nf_conntrack_netlink.c
+++ b/net/netfilter/nf_conntrack_netlink.c
--- a/net/netfilter/nfnetlink.c
+++ b/net/netfilter/nfnetlink.c
--- a/net/netlink/af_netlink.c
+++ b/net/netlink/af_netlink.c
--- a/net/rxrpc/ar-accept.c
+++ b/net/rxrpc/ar-accept.c
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
--- a/sound/pci/hda/patch_analog.c
+++ b/sound/pci/hda/patch_analog.c
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig