tree 66119712683a8e1d4d4339d72864ceeb7e1806f0
parent b8d9e572cb8794335fb4ba63ff962acaa3c4473b
parent 6352c87ff69daa2211419ec2c34ddb8bc116c505
author John W. Linville <linville@tuxdriver.com> 1353092391 -0500
committer John W. Linville <linville@tuxdriver.com> 1353092391 -0500

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