tree 9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7
parent 6a398a3ef404e661999cd4c58974cbceb52762e3
parent c546d5db75b452737e554bb9c33dedb46847c4fd
author Linus Torvalds <torvalds@linux-foundation.org> 1435270956 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1435270956 -0700

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>