git.cascardo.info Git - cascardo/linux.git/commit

projects / cascardo / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ccb1435 e476a5a)

author	John W. Linville <linville@tuxdriver.com>
	Wed, 24 Nov 2010 21:19:24 +0000 (16:19 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Wed, 24 Nov 2010 21:19:24 +0000 (16:19 -0500)
commit	d7a066c92394f3e777351de0c903beeb8a08af76
tree	f54ce8ac77d32b4c3166b4a2ca92525174a3213b	tree \| snapshot
parent	ccb14354017272ddac002e859a2711610b6af174	commit \| diff
parent	e476a5a41ad67d0e2b4a652820c49a3923eb936b	commit \| diff

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-2.6

19 files changed:

drivers/net/wireless/ath/ath9k/ath9k.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/eeprom_9287.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_txrx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/recv.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/reg.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl3945-base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/cfg.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/dev.h	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/libertas/main.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.