Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 14 Oct 2013 17:22:59 +0000 (13:22 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 14 Oct 2013 17:22:59 +0000 (13:22 -0400)
commit4db89e149cde12f9390bfe90807cf4c5de74fcde
tree0c43ca509fa55ffcad187a8f52f59d64f1d941a0
parent4978705d26149a629b9f50ff221caed6f1ae3048
parentd86aa4f8ca58898ec6a94c0635da20b948171ed7
Merge branch 'for-john' of git://git./linux/kernel/git/jberg/mac80211