diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-25 15:22:36 -0700 |
commit | ad90fb97515b732bc27a0109baa10af636c3c8cd (patch) | |
tree | 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7 /fs/fuse/file.c | |
parent | 6a398a3ef404e661999cd4c58974cbceb52762e3 (diff) | |
parent | c546d5db75b452737e554bb9c33dedb46847c4fd (diff) | |
download | op-kernel-dev-ad90fb97515b732bc27a0109baa10af636c3c8cd.zip op-kernel-dev-ad90fb97515b732bc27a0109baa10af636c3c8cd.tar.gz |
Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
Pull asm/scatterlist.h removal from Jens Axboe:
"We don't have any specific arch scatterlist anymore, since parisc
finally switched over. Kill the include"
* 'for-4.2/sg' of git://git.kernel.dk/linux-block:
remove scatterlist.h generation from arch Kbuild files
remove <asm/scatterlist.h>
Diffstat (limited to 'fs/fuse/file.c')
0 files changed, 0 insertions, 0 deletions