tree c4cdf4dcb98359bf19c2f2f48f1cb9db4603c5ba
parent ecc3d5ae17e62ce1250abf16ff523c677bf19e2f
parent c8312facd99b4cd05998fe3440926b667a896c9e
author John W. Linville <linville@tuxdriver.com> 1278440341 -0400
committer John W. Linville <linville@tuxdriver.com> 1278440341 -0400

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