]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
projects / ~emulex / infiniband.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7106891 11ef4cf)
Merge tag 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Sep 2012 21:28:17 +0000 (14:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Sep 2012 21:28:17 +0000 (14:28 -0700)
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


Trivial merge
Emulex OneConnect RDMA Driver