]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'xentip-3.13-3' into linux-next-3
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 4 Dec 2013 11:48:01 +0000 (11:48 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Wed, 4 Dec 2013 11:48:01 +0000 (11:48 +0000)

Trivial merge