tree c9d7cc47b328cc560c98c846b1995abbe3ab4538
parent aa4a625088f9117f3bebfc21943c3d5d8a4cf81e
parent 192c80a2499cf2571924081c646262036d841484
author John W. Linville <linville@tuxdriver.com> 1395256447 -0400
committer John W. Linville <linville@tuxdriver.com> 1395256447 -0400

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