Merge branch 'for-linville' of git://github.com/sgruszka/iwlegacy
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Nov 2011 21:00:56 +0000 (16:00 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Nov 2011 21:00:56 +0000 (16:00 -0500)

Trivial merge