tree 2a76f128eb457e1bacb585260b3e03f72b03cc1e
parent d6067f0e17eb1de7d9b1d792f67d17c6e894b770
parent 97dc94f1d933c9df2c0b327066ea130c0e92083f
author John W. Linville <linville@tuxdriver.com> 1403723714 -0400
committer John W. Linville <linville@tuxdriver.com> 1403724396 -0400

Merge git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next