Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
commit53c5251366e7b815f76f92260b594446c94bd534
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 26 Nov 2012 19:25:22 +0000 (26 14:25 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 26 Nov 2012 19:25:22 +0000 (26 14:25 -0500)
tree5af7c3a3a064ef68edb23b33fcbc8b91caa61520
parent400e020892a9a20eea5d2c9bce8bfb312075c4ba
parent5edd0b946a0afeb1d0364a3654328b046fb818a2
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes