git.openwrt.org Git - openwrt/staging/blogic.git/commit

projects / openwrt / staging / blogic.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: d9f72f3 97ea6d0)

author	John W. Linville <linville@tuxdriver.com>
	Fri, 28 Sep 2012 15:11:16 +0000 (11:11 -0400)
committer	John W. Linville <linville@tuxdriver.com>
	Fri, 28 Sep 2012 15:11:16 +0000 (11:11 -0400)
commit	c487606f835a93a725bac1aefd536be98f22474d
tree	c77571a519905945e24a9ea6e4e44d9032fd527d	tree \| snapshot
parent	d9f72f359e00a45a6cd7cc2d5121b04b9dc927e1	commit \| diff
parent	97ea6d0f3eb019891038cd2dfddb749d6bf219be	commit \| diff

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

Conflicts:
net/nfc/netlink.c

Signed-off-by: John W. Linville <linville@tuxdriver.com>

Documentation/feature-removal-schedule.txt	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/net/wireless/mac80211_hwsim.c	diff1 \|	diff2 \|	blob \| history
include/net/cfg80211.h	diff1 \|	diff2 \|	blob \| history
include/net/nfc/nfc.h	diff1 \|	diff2 \|	blob \| history
net/nfc/netlink.c	diff1 \|	diff2 \|	blob \| history
net/wireless/mlme.c	diff1 \|	diff2 \|	blob \| history
net/wireless/nl80211.c	diff1 \|	diff2 \|	blob \| history

John Crispins staging tree