Merge tag 'arc-fixes-for-3.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Dec 2013 21:50:42 +0000 (13:50 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 20 Dec 2013 21:50:42 +0000 (13:50 -0800)
commit4773ef2241aa9bdca5b8cb228253981b73883ec9
treecb8618c9a2a38406415ec12fabfc323b2135aa10
parenta81ce79bf294bf61fd3069abdb0923598615da84
parent1e01c7eb7c431a74437d73fe54670398b4d2b222
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