Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Feb 2013 19:25:28 +0000 (14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 11 Feb 2013 19:25:28 +0000 (14:25 -0500)
commit3b6990838cf39e152fb5c88ca81bddcdb4ae43e3
tree4495d07ddf9f4d06e895ef98f74bc196f5914a46
parent7b2385b95363c9ff49801c19cba2489a05bd6672
parent3d9646d0abd02c552f6f15c302b31aa321c2fa8b
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211