]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'xentip/stable/for-linus-3.13' into linux-next
authorStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 6 Dec 2013 20:43:02 +0000 (20:43 +0000)
committerStefano Stabellini <stefano.stabellini@eu.citrix.com>
Fri, 6 Dec 2013 20:43:02 +0000 (20:43 +0000)

Trivial merge