From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 26 Sep 2012 21:28:17 +0000 (-0700)
Subject: Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
X-Git-Tag: v3.6~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5e19997a742c7c8203be628a7a69babc3bcf01a4;p=~emulex%2Finfiniband.git

Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming

Pull c6x arch fixes from Mark Salter:
  - Add __NR_kcmp to generic syscall list
  - C6X: Use generic asm/barrier.h

* tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming:
  syscalls: add __NR_kcmp syscall to generic unistd.h
  c6x: use asm-generic/barrier.h
---

5e19997a742c7c8203be628a7a69babc3bcf01a4