]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'mvebu/of_pci' into for-next
authorJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:02:55 +0000 (18:02 +0000)
committerJason Cooper <jason@lakedaemon.net>
Thu, 13 Jun 2013 18:02:55 +0000 (18:02 +0000)

Trivial merge