Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi...
authorJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:40:38 +0000 (14:40 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 22 Jun 2012 18:40:38 +0000 (14:40 -0400)
commit9ffddb1a93d732bb098e1833733624231c73dd72
tree75e592956c34c567b801db3dba9f5be26fd4e38b
parent133189a46c2c522eb4ef26b1ede63dd0a9fdc920
parente75dac921d88ac1fa1ad08686ab242556f8b888b
Merge branch 'for-john' of git://git./linux/kernel/git/iwlwifi/iwlwifi-next