Merge branch 'for_upstream' of git://git.qlogic.com/linux-firmware
authorBen Hutchings <ben@decadent.org.uk>
Tue, 25 Dec 2012 23:14:21 +0000 (23:14 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 25 Dec 2012 23:14:21 +0000 (23:14 +0000)

Trivial merge