Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 18:01:43 +0000 (14:01 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 22 May 2014 18:01:43 +0000 (14:01 -0400)
commitb88bb291b21f364c5441bdbf8195502bc75e6b47
treefb0c59e70c92e60f7c733f0005f61bad93acb8d3
parent40a10fd740a4d5a9f3da255cf8dae48c6723d1a6
parent999609f1206a14039db534058b251c6d5ab39322
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next