Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 18:50:17 +0000 (14:50 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Mar 2013 18:50:17 +0000 (14:50 -0400)
1  2 
net/wireless/core.c

Simple merge