]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote branch 'xentip/stable/for-linus-3.12' into linux-next
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Sep 2013 19:09:14 +0000 (19:09 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 11 Sep 2013 19:09:14 +0000 (19:09 +0000)

Trivial merge