git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8d13a2a c69b909)

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	263fb5b1bf9265d0e4ce59ff6ea92f478b5b61ea
tree	5ee497d530185d32421122729af86cf77d0dc649	tree \| snapshot
parent	8d13a2a9fb3e5e3f68e9d3ec0de3c8fcfa56a224	commit \| diff
parent	c69b90920a36b88ab0d649963d81355d865eeb05	commit \| diff

Merge branch 'master' of /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

ep93xx device tree rework repo: git://git.maquefel.me/linux.git