tree 50aab5930d1c9c2f8574be004e7aeac1141db64f
parent a50f9d5ee0f81271be49d64801bee0dfe84c2127
parent efc5520c4224479967b7381775a63fb48283b082
author John W. Linville <linville@tuxdriver.com> 1389036007 -0500
committer John W. Linville <linville@tuxdriver.com> 1389036007 -0500

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