From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 25 Jun 2015 22:22:36 +0000 (-0700)
Subject: Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~118
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ad90fb97515b732bc27a0109baa10af636c3c8cd;p=pandora-kernel.git

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>
---

ad90fb97515b732bc27a0109baa10af636c3c8cd
Reading git-diff-tree failed