tree cf2c9fa680828ea4a9882ee2561e9b12d643adbe
parent 040a78314fe3cbb1472ac220cb3400116f6967bc
parent 88bc40e8c3d3bca7d26c756bb0b823d4abad3355
author John W. Linville <linville@tuxdriver.com> 1342552051 -0400
committer John W. Linville <linville@tuxdriver.com> 1342552051 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next