From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 20 Dec 2013 21:50:42 +0000 (-0800)
Subject: Merge tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: firefly_0821_release~176^2~4738
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4773ef2241aa9bdca5b8cb228253981b73883ec9;p=firefly-linux-kernel-4.4.55.git

Merge tag 'arc-fixes-for-3.13-rc5' of git://git./linux/kernel/git/vgupta/arc

Pull ARC fix from Vineet Gupta:
 "Fix busted syscall table due to unistd header inclusion issue"

* tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
  ARC: Allow conditional multiple inclusion of uapi/asm/unistd.h
---

4773ef2241aa9bdca5b8cb228253981b73883ec9