]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'arch-ia64' into no-rebases
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 19 Oct 2012 18:29:15 +0000 (14:29 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 19 Oct 2012 18:29:15 +0000 (14:29 -0400)

Trivial merge