diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-10 17:48:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-04-10 17:48:17 -0700 |
| commit | 08b15d13864279aae10443c48cb268d823895b14 (patch) | |
| tree | 87a415daab890cd28851beb4478595aae1778cdd /fs/ceph/locks.c | |
| parent | 2f422f94eea83f50755df76be8f5ff86ef89ad80 (diff) | |
| parent | 208fae5c3b9431013ad7bcea07cbcee114e7d163 (diff) | |
| download | linux-08b15d13864279aae10443c48cb268d823895b14.tar.gz linux-08b15d13864279aae10443c48cb268d823895b14.tar.bz2 linux-08b15d13864279aae10443c48cb268d823895b14.zip | |
Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A couple of small fixes, and wiring up the new syscalls which appeared
during the merge window"
* 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8550/1: protect idiv patching against undefined gcc behavior
ARM: wire up preadv2 and pwritev2 syscalls
ARM: SMP enable of cache maintanence broadcast
Diffstat (limited to 'fs/ceph/locks.c')
0 files changed, 0 insertions, 0 deletions