tree f278b61c99f3b8a92bedf23d55f52127da8657d8
parent b6251243ac0a3cb63afe748133f6600f77526078
parent acfcd9ed588465e48efe5ceb67177096d51c95a9
author John W. Linville <linville@tuxdriver.com> 1393958048 -0500
committer John W. Linville <linville@tuxdriver.com> 1393958048 -0500

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