]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'xentip-3.13-2' into linux-next-2
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 15 Nov 2013 14:30:20 +0000 (14:30 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 15 Nov 2013 14:30:20 +0000 (14:30 +0000)

Trivial merge