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)
commit5e19997a742c7c8203be628a7a69babc3bcf01a4
treef9735a535b5d97530d36d0900f5e212063bbefd9
parent7106891a5c5960782801366ac49e47aa996b662f
parent11ef4cfac935ab45eb4c7f98d26c78ee69627909
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