git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a33bc5c 0a92457)

author	David S. Miller <davem@davemloft.net>
	Fri, 31 Jul 2009 02:22:43 +0000 (19:22 -0700)
committer	David S. Miller <davem@davemloft.net>
	Fri, 31 Jul 2009 02:22:43 +0000 (19:22 -0700)
commit	df597efb5737063497f1a4f7c996cc9aec294230
tree	17bb60f68ee299d9717038197a932501625f1621	tree \| snapshot
parent	a33bc5c15154c835aae26f16e6a3a7d9ad4acb45	commit \| diff
parent	0a924578bc4a2823a95c151f56975c71f5c156bb	commit \| diff

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

Conflicts:
drivers/net/wireless/iwlwifi/iwl-3945.h
drivers/net/wireless/iwlwifi/iwl-tx.c
drivers/net/wireless/iwlwifi/iwl3945-base.c

18 files changed:

drivers/net/3c515.c	diff1 \|	diff2 \|	blob \| history
drivers/net/at1700.c	diff1 \|	diff2 \|	blob \| history
drivers/net/eepro.c	diff1 \|	diff2 \|	blob \| history
drivers/net/eexpress.c	diff1 \|	diff2 \|	blob \| history
drivers/net/fealnx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe.h	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_ethtool.c	diff1 \|	diff2 \|	blob \| history
drivers/net/ixgbe/ixgbe_main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/netxen/netxen_nic_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/tokenring/ibmtr.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/airo.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwmc3200wifi/netdev.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/assoc.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mlme.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/rx.c	diff1 \|	diff2 \|	blob \| history
net/netlabel/netlabel_kapi.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree