rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

]> rtime.felk.cvut.cz Git - can-eth-gw-linux.git/commit

projects / can-eth-gw-linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 55cb079 da29d2a)

author	John W. Linville <linville@tuxdriver.com>
	Thu, 6 Dec 2012 19:58:41 +0000 (14:58 -0500)
committer	John W. Linville <linville@tuxdriver.com>
	Thu, 6 Dec 2012 19:58:41 +0000 (14:58 -0500)
commit	403e16731ffddc097eae89f53f9a7b0f0c9769c4
tree	228d17985ad8ea22a7763457bf9641eb44781568	tree \| snapshot
parent	55cb0797fa779e36f62876a8aa44cbf3984e8d59	commit \| diff
parent	da29d2a5780d80857773d7776b7603a449b0b6e0	commit \| diff

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

Conflicts:
drivers/net/wireless/mwifiex/sta_ioctl.c
net/mac80211/scan.c

drivers/net/wireless/mwifiex/sta_ioctl.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/cfg.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/ieee80211_i.h	diff1 \|	diff2 \|	blob \| history
net/mac80211/main.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/scan.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/status.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/tx.c	diff1 \|	diff2 \|	blob \| history
net/mac80211/util.c	diff1 \|	diff2 \|	blob \| history
net/wireless/reg.c	diff1 \|	diff2 \|	blob \| history