tree fe8405c00398b6b74d76c7dec61196732a4e33b1
parent 83860c594f65945b1a2c99e84338e1145cd34890
parent 7eaa6a5e964f1ab02d849bda36950c0d30be8ce2
author John W. Linville <linville@tuxdriver.com> 1301947836 -0400
committer John W. Linville <linville@tuxdriver.com> 1301947836 -0400

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