]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
authorDavid S. Miller <davem@davemloft.net>
Mon, 25 Jun 2012 22:50:32 +0000 (15:50 -0700)
committerDavid S. Miller <davem@davemloft.net>
Mon, 25 Jun 2012 22:50:32 +0000 (15:50 -0700)
commitd9c98cac28d7c3266dbfa1fede3d4d940b663b62
tree3fb17b54454a101416c2b22e6b4ea5a027b3c02b
parent9e6cf95df38b1578af60c56adc67a13f4a8b319a
parenta53cf7143f6218c98f15db79efdd5ca5385d7193
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Conflicts:
drivers/net/usb/qmi_wwan.c
net/batman-adv/translation-table.c
net/ipv6/route.c

qmi_wwan.c resolution provided by Bjørn Mork.

batman-adv conflict is dealing merely with the changes
of global function names to have a proper subsystem
prefix.

ipv6's route.c conflict is merely two side-by-side additions
of network namespace methods.

Signed-off-by: David S. Miller <davem@davemloft.net>
21 files changed:
drivers/bluetooth/btmrvl_sdio.c
drivers/bluetooth/btusb.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
drivers/net/ethernet/emulex/benet/be_cmds.c
drivers/net/ethernet/emulex/benet/be_cmds.h
drivers/net/ethernet/emulex/benet/be_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
drivers/net/usb/qmi_wwan.c
drivers/net/usb/usbnet.c
drivers/net/wireless/airo.c
drivers/net/wireless/ath/ath9k/ath9k.h
drivers/net/wireless/ath/ath9k/hw.c
drivers/net/wireless/ath/ath9k/xmit.c
drivers/net/wireless/iwlwifi/dvm/debugfs.c
drivers/net/wireless/mwifiex/cfg80211.c
net/batman-adv/translation-table.c
net/bluetooth/l2cap_core.c
net/bluetooth/mgmt.c
net/ipv6/ip6_fib.c
net/ipv6/route.c