git.stricted.de - GitHub/LineageOS/android_kernel_samsung_universal7580.git/commit

projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 391e5c2 2f8684c)

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	38a00840638b4932152bca48098dbfa069d942a2
tree	dd12897854f6df8aac237d5fd46551c74be8153a	tree \| snapshot (tar.gz zip)
parent	391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f	commit \| diff
parent	2f8684ce7a47c91da7e0ccba2686277c103d02b6	commit \| diff

Merge branch 'master' of git://git./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