Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac802...
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Feb 2013 20:27:42 +0000 (15:27 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Feb 2013 20:27:42 +0000 (15:27 -0500)
commita9908ebf5ceb044eee6d9fda018d33cbf27df719
tree281c858c19ba5e099e9a1eed84fa67dcfb2628f4
parentcfe418287c61f4c4a3ccb94e8a286434d64e0236
parent8c6d59ee3509acd474365c34db291b950d2e66bf
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211-next