Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 18:28:21 +0000 (14:28 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 18:28:21 +0000 (14:28 -0400)
commitd90b9e29ec5fe7a08eb7965386ebb47615306584
tree87eba8a229b302f5bffcca5a085f271430330ac1
parent6bb7aabf73401c9cfca26c71ccae1e3d6e1640d5
parent622ebe994f6866b8d46ee5d3bcc329ed65d3722d
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-fixes