Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Feb 2014 20:14:34 +0000 (15:14 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 4 Feb 2014 20:14:34 +0000 (15:14 -0500)
commit235c0dc55aa52157bbaf2917e0a4bd8ae965c43a
treee45e7384caef706709d2270337c4dcb0d03eb69a
parent53d8ab29f8f6d67e37857b68189b38fa3d87dd8e
parentc512865446e6dd5b6e91e81187e75b734ad7cfc7
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes