tree c5e95347439b75ba4bd67c566f42f7aaf7730403
parent 53b2f828487ea7a3f6fa4007b629466fb0d14339
parent d70b7616d9080ec9f868fbd31db5fd4341435d61
author John W. Linville <linville@tuxdriver.com> 1377712160 -0400
committer John W. Linville <linville@tuxdriver.com> 1377712160 -0400

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