Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:23:13 +0000 (14:23 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 22 Jan 2013 19:23:13 +0000 (14:23 -0500)
commitead0ad1648990638e624f57d446f1fa4c577d87d
tree674063d85501781b4aeaf8e4f97a965a22cdfa3e
parentcb4ec37d485b05decf4bdcd11724362c7f03606a
parent8680451f38a64bd270233b3c0eeb7c45f2b5efe3
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211