diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-26 14:28:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-09-26 14:28:17 -0700 |
commit | 5e19997a742c7c8203be628a7a69babc3bcf01a4 (patch) | |
tree | f9735a535b5d97530d36d0900f5e212063bbefd9 /fs | |
parent | 7106891a5c5960782801366ac49e47aa996b662f (diff) | |
parent | 11ef4cfac935ab45eb4c7f98d26c78ee69627909 (diff) | |
download | linux-3.10-5e19997a742c7c8203be628a7a69babc3bcf01a4.tar.gz linux-3.10-5e19997a742c7c8203be628a7a69babc3bcf01a4.tar.bz2 linux-3.10-5e19997a742c7c8203be628a7a69babc3bcf01a4.zip |
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
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions