tree 213e6db3ececae54a6c61ccfe256ac3513cc8a3b
parent bbf807bc0697e577c137a5fffb30fca7c6a45da1
parent bd02cd2549cfcdfc57cb5ce57ffc3feb94f70575
author John W. Linville <linville@tuxdriver.com> 1387305140 -0500
committer John W. Linville <linville@tuxdriver.com> 1387305140 -0500

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