Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:46:50 +0000 (14:46 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 28 Jan 2013 19:46:50 +0000 (14:46 -0500)
commitcb73e2b9ed1240398c773eec3c976edd99baf5b9
tree5642923e9bee3f5dac4f31f6a26482726990034b
parent83f0c6d1f502bd75bb4a9e31e8d64e59c6894ad1
parentc49dc9008b1c641a86837297df7c90cef070571b
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211