tree 939634bedbabfcd389ab7ad96ab7e161e25b2061
parent da1fdb02d9200ff28b6f3a380d21930335fe5429
parent 9f6e1bafac4f3c58c8a670496adcc4d313d3c7f7
author John W. Linville <linville@tuxdriver.com> 1275507411 -0400
committer John W. Linville <linville@tuxdriver.com> 1275507411 -0400

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