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: 086f84c 65feecc)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 12 Jul 2012 17:44:50 +0000 (13:44 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 12 Jul 2012 17:44:50 +0000 (13:44 -0400)
commit	2deb42e8249a080884e1d3914ee2fcc51f1be980
tree	dd12897854f6df8aac237d5fd46551c74be8153a	tree \| snapshot
parent	086f84c6a47441d67b1c1adabe2e76ae82245897	commit \| diff
parent	65feecc49293223cf577bf88478415285e8c3b4c	commit \| diff

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

14 files changed:

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wimax/i2400m/fw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/ar9003_eeprom.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/carl9170/rx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/dma.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/pcie/trans.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/cfg80211.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmd.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mwifiex/sta_cmdresp.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/mesh_plink.c	diff1 \|	diff2 \|	blob \| history
net/nfc/netlink.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.