Merge branch 'linux-firmware' of git://github.com/TI-OpenLink/firmwares
authorBen Hutchings <ben@decadent.org.uk>
Sat, 30 Jun 2012 18:50:47 +0000 (19:50 +0100)
committerBen Hutchings <ben@decadent.org.uk>
Sat, 30 Jun 2012 18:50:47 +0000 (19:50 +0100)

Trivial merge