]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'arch-frv' into no-rebases
authorAl Viro <viro@zeniv.linux.org.uk>
Fri, 2 Nov 2012 23:00:20 +0000 (19:00 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 2 Nov 2012 23:00:20 +0000 (19:00 -0400)
1  2 
arch/m68k/include/asm/unistd.h
arch/s390/Kconfig

Simple merge
Simple merge