Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:49:16 +0000 (15:49 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 5 Nov 2013 20:49:16 +0000 (15:49 -0500)
commitb476d3f143e8b213273834e92615370ca65ff126
tree0a3fee28a93f580a5474165dbdc3837d580310b6
parent353c78152c10027b8da5de446bad3472f977fcdc
parentbbe09bbcf4454e826e3fb08e87d81f32c0030658
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211