diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-03 16:51:08 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-03 16:51:08 +0100 |
commit | 87fc5c686ef3db9e58d2fd65e1bcc368ee6b1b76 (patch) | |
tree | 60356b82b5cb986a85bd4fde31805e4b96787bd5 /fs/orangefs/dir.c | |
parent | Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | ARM: avoid faulting on qemu (diff) | |
download | linux-87fc5c686ef3db9e58d2fd65e1bcc368ee6b1b76.tar.xz linux-87fc5c686ef3db9e58d2fd65e1bcc368ee6b1b76.zip |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"Just one fix this time around, for the late commit in the merge window
that triggered a problem with qemu. Qemu is apparently also going to
receive a fix for the discovered issue"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: avoid faulting on qemu
Diffstat (limited to 'fs/orangefs/dir.c')
0 files changed, 0 insertions, 0 deletions