git.stricted.de - GitHub/moto-9609/android_kernel_motorola

author	David S. Miller <davem@davemloft.net>
	Fri, 19 Nov 2010 21:13:47 +0000 (13:13 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 19 Nov 2010 21:13:47 +0000 (13:13 -0800)
commit	24912420e923d56461b400d83f250a31bed8a964
tree	3bb599e665ed7510df2e3f4c8cb008f7a33f50a9	tree \| snapshot (tar.gz zip)
parent	0670b8ae66daf1d326c7bd10e73daff5f18fcf92	commit \| diff
parent	0302b8622ce696af1cda22fcf207d3793350e896	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_9287.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/usb.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/neighbour.h	diff1 \|	diff2 \|	blob \| history
net/core/filter.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/icmp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history