Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:40:26 +0000 (14:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 20 Jun 2012 18:40:26 +0000 (14:40 -0400)
commit324640e3594e9d824e72e864001a83d003588363
treec061f6d49f1dafcd7083482c581f831140087bc1
parentce77903c915ba05668ecffabd0e20bc2a61c2b3a
parent8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next