Merge branches 'for-next', 'arch-avr32', 'arch-blackfin', 'arch-cris', 'arch-h8300...

author Al Viro <viro@zeniv.linux.org.uk>

Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)

committer Al Viro <viro@zeniv.linux.org.uk>

Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)
author Al Viro <viro@zeniv.linux.org.uk>
Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)
committer Al Viro <viro@zeniv.linux.org.uk>
Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)
diff --cc arch/sh/include/asm/unistd.h
Simple merge
author	Al Viro <viro@zeniv.linux.org.uk>
	Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)
committer	Al Viro <viro@zeniv.linux.org.uk>
	Fri, 2 Nov 2012 23:11:41 +0000 (19:11 -0400)