tree c061f6d49f1dafcd7083482c581f831140087bc1
parent ce77903c915ba05668ecffabd0e20bc2a61c2b3a
parent 8d40f4eebf43bd73aa7c6e06665fd7a26012f9c9
author John W. Linville <linville@tuxdriver.com> 1340217626 -0400
committer John W. Linville <linville@tuxdriver.com> 1340217626 -0400

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next