git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 559c33d 26b0e41)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 13 Jan 2014 19:40:59 +0000 (14:40 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 13 Jan 2014 19:40:59 +0000 (14:40 -0500)
commit	f13352519ee8c4b22b87fc1a47743d1f53ea193e
tree	48c18144f3e5e530ec61d5eadbb5a34675a69fe8	tree
parent	559c33d84da71e07816e692bfd73ad92675256a6	commit \| diff
parent	26b0e411d37a2ca5992d02884dc3fa4e1907e598	commit \| diff

Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next

13 files changed:

drivers/net/wireless/adm8211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/at76c50x-usb.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath10k/mac.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath5k/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/htc_drv_init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/init.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/cw1200/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwl8k.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/p54/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/base.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ti/wl1251/main.c	diff1 \|	diff2 \|	blob \| history
net/wireless/sme.c	diff1 \|	diff2 \|	blob \| history

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