Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 19 Nov 2010 21:13:47 +0000 (13:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Nov 2010 21:13:47 +0000 (13:13 -0800)
commit24912420e923d56461b400d83f250a31bed8a964
tree3bb599e665ed7510df2e3f4c8cb008f7a33f50a9
parent0670b8ae66daf1d326c7bd10e73daff5f18fcf92
parent0302b8622ce696af1cda22fcf207d3793350e896
Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
drivers/net/bnx2x/bnx2x_main.c
drivers/net/bonding/bond_main.c
drivers/net/wireless/ath/ath9k/eeprom_9287.c
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
drivers/net/wireless/ath/ath9k/init.c
drivers/net/wireless/ath/carl9170/usb.c
include/net/cfg80211.h
include/net/neighbour.h
net/core/filter.c
net/ipv4/icmp.c
net/ipv6/addrconf.c