Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 22:22:36 +0000 (15:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 25 Jun 2015 22:22:36 +0000 (15:22 -0700)
commitad90fb97515b732bc27a0109baa10af636c3c8cd
tree9d49cfffb8c52b0bab9a443b39c6e7df7b7e03b7
parent6a398a3ef404e661999cd4c58974cbceb52762e3
parentc546d5db75b452737e554bb9c33dedb46847c4fd
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>
13 files changed:
Documentation/scsi/scsi_mid_low_api.txt
arch/alpha/include/asm/pci.h
arch/frv/include/asm/pci.h
arch/ia64/include/asm/pci.h
arch/microblaze/include/asm/pci.h
arch/mips/include/asm/pci.h
arch/mn10300/include/asm/pci.h
arch/parisc/include/asm/pci.h
arch/powerpc/include/asm/pci.h
arch/x86/include/asm/pci.h
include/linux/blkdev.h
include/linux/scatterlist.h
lib/swiotlb.c