From: Russell King <rmk+kernel@armlinux.org.uk>
Date: Wed, 14 Dec 2016 11:14:00 +0000 (+0000)
Subject: Merge branch 'syscalls' into for-linus
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ed141f2890cdb738fc7131367f5fb15632bc3e60;p=linux-beck.git

Merge branch 'syscalls' into for-linus

Conflicts:
	arch/arm/include/asm/unistd.h
	arch/arm/include/uapi/asm/unistd.h
	arch/arm/kernel/calls.S
---

ed141f2890cdb738fc7131367f5fb15632bc3e60