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

projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commit

author	David S. Miller <davem@davemloft.net>
	Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
committer	David S. Miller <davem@davemloft.net>
	Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
commit	b4aa9e05a61b845541fa6f5b1d246976922601f0
tree	ca94478c3df281ab76a3399f5ba6341ade3f5791	tree \| snapshot (tar.gz zip)
parent	1dc0f3c54ce1df957f99c17b145488fd03eb1a59	commit \| diff
parent	4b8fe66300acb2fba8b16d62606e0d30204022fc	commit \| diff

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c

37 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/atm/fore200e.c	diff1 \|	diff2 \|	blob \| history
drivers/atm/lanai.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bonding.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/enic/enic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/axnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge.h	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_mpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54usb.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/core/timestamping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/work.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/atm/fore200e.c	diff1 \|	diff2 \|	blob \| history
drivers/atm/lanai.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be.h	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/net/benet/be_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bond_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/bonding/bonding.h	diff1 \|	diff2 \|	blob \| history
drivers/net/cxgb4vf/cxgb4vf_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/enic/enic_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/pcmcia/axnet_cs.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge.h	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/qlge/qlge_mpi.c	diff1 \|	diff2 \|	blob \| history
drivers/net/r8169.c	diff1 \|	diff2 \|	blob \| history
drivers/net/usb/hso.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-1000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn-lib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/p54usb.c	diff1 \|	diff2 \|	blob \| history
include/net/sock.h	diff1 \|	diff2 \|	blob \| history
net/bluetooth/rfcomm/core.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/sock.c	diff1 \|	diff2 \|	blob \| history
net/core/timestamping.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/udp.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/addrconf.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/route.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/udp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ibss.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/work.c	diff1 \|	diff2 \|	blob \| history
net/sctp/socket.c	diff1 \|	diff2 \|	blob \| history
net/socket.c	diff1 \|	diff2 \|	blob \| history