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 19:12:41 +0000 (15:12 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 12 Jun 2013 19:12:41 +0000 (15:12 -0400)
commitcb180840a0c6bff7c0787373c23cefdf20417a27
treeb291b4df78fe08c35297271163b71fd86350a53c
parent5631becbb8703d73239e097d222b183aa4f24e40
parent8eb3871076875f247483f4a1fe6713e6d440c53e
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next