Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Nov 2013 20:47:18 +0000 (15:47 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 25 Nov 2013 20:47:18 +0000 (15:47 -0500)
commitd5aedd7e1b2f024ced0486aeb730bc56875e5ac9
tree8ba9d15789748952e5e02d7a8a4a8cda0e16ccfd
parent517543fd72d577dde2ebd9505dc4abf26d589f9a
parent24d47300d118c5909a51b7270276d749cce150a2
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211