]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'no-rebases' into for-next
authorAl Viro <viro@zeniv.linux.org.uk>
Mon, 29 Oct 2012 18:23:12 +0000 (14:23 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Mon, 29 Oct 2012 18:23:12 +0000 (14:23 -0400)
1  2 
arch/m68k/include/asm/unistd.h
arch/s390/Kconfig

Simple merge
Simple merge