Merge tag 'for-linville-20130318' of git://github.com/kvalo/ath6kl
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 20:34:55 +0000 (16:34 -0400)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 18 Mar 2013 20:34:55 +0000 (16:34 -0400)

Trivial merge