Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jun 2013 00:00:11 +0000 (20:00 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 27 Jun 2013 00:00:11 +0000 (20:00 -0400)
commit59731bb8c4f1536c5b698dc1aec82d7a5cef41eb
treeb6e245cfae009fe9e108d6adaed3e0f56fd2969e
parent729d8d182bbf296b32cb2e7f970801eb6ce33c6a
parentbd4ace2a36e7c87bb5f3eceb54d3b304d395dcf0
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next