git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 18ebc91 22a3910)

author	David S. Miller <davem@davemloft.net>
	Wed, 9 Feb 2011 01:19:01 +0000 (17:19 -0800)
committer	David S. Miller <davem@davemloft.net>
	Wed, 9 Feb 2011 01:19:01 +0000 (17:19 -0800)
commit	67cb95db85a14db9d3a8d88805e0909463554f08
tree	5ee497d530185d32421122729af86cf77d0dc649	tree \| snapshot
parent	18ebc91c2dc69512742138b657cf2b84b94e53e7	commit \| diff
parent	22a3910dacdd608851386c0c16ed4a9911e589f9	commit \| diff

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
drivers/net/e1000e/netdev.c

14 files changed:

drivers/net/bnx2x/bnx2x_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/e1000e/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/xmit.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/wl1251/main.c	diff1 \|	diff2 \|	blob \| history
net/batman-adv/unicast.c	diff1 \|	diff2 \|	blob \| history
net/core/dev.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.