tree cbfc2fd2ffac1ca4b8695a391450df87ad53643d
parent 375e875c696ae65e7ce748721ec2dc93ca0a16df
parent 499892f2a9ad89910ff21c687273ac80b4367dc0
author John W. Linville <linville@tuxdriver.com> 1366979859 -0400
committer John W. Linville <linville@tuxdriver.com> 1366979859 -0400

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