]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'arch-parisc' into no-rebases
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 22 Oct 2012 02:38:40 +0000 (22:38 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 22 Oct 2012 02:38:40 +0000 (22:38 -0400)

Trivial merge