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

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: ffcb973 c288ec6)

author	John W. Linville <linville@tuxdriver.com>
	Mon, 5 Mar 2012 20:05:54 +0000 (15:05 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Mon, 5 Mar 2012 20:05:54 +0000 (15:05 -0500)
commit	051d3b50430160a86cbe4a2deef219c8038bd03f
tree	b2c276067819f259f86369e5341202332a8172be	tree \| snapshot
parent	ffcb97388b1d41b1db063eb041cb9af408662127	commit \| diff
parent	c288ec614e264b46853c65d3db9ccf91d53c9484	commit \| diff

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

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ath/ath9k/hw.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/main.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/brcm80211/brcmsmac/phy/phy_n.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/ipw2x00/ipw2100.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/iwlwifi/iwl-trans-pcie-tx.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192de/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/phy.c	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/rtlwifi/rtl8192se/sw.c	diff1 \|	diff2 \|	blob \| history

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