git.stricted.de - GitHub/moto-9609/android_kernel_motorola_exynos9610.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: ccb7c77 05d1760)

author	David S. Miller <davem@davemloft.net>
	Wed, 21 Apr 2010 08:14:25 +0000 (01:14 -0700)
committer	David S. Miller <davem@davemloft.net>
	Wed, 21 Apr 2010 08:14:25 +0000 (01:14 -0700)
commit	87eb367003887cdc81a5d183efea227b5b488961
tree	40f617e25a9364d573e3cd2189c9e7fa56c8a0fe	tree \| snapshot (tar.gz zip)
parent	ccb7c7732e2ceb4e81a7806faf1670be9681ccd2	commit \| diff
parent	05d17608a69b3ae653ea5c9857283bef3439c733	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-6000.c
net/core/dev.c

18 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/8139too.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-6000.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-agn.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-calib.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-core.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-eeprom.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-scan.c	diff1 \|	diff2 \|	blob \| history
net/bridge/br_multicast.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/ipv4/ip_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/ip6_output.c	diff1 \|	diff2 \|	blob \| history
net/ipv6/tcp_ipv6.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/agg-tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/packet/af_packet.c	diff1 \|	diff2 \|	blob \| history