From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Thu, 25 Oct 2007 22:44:54 +0000 (-0700)
Subject: Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=7f1495745347bc2cb9cc4f50d0a889caeb71f1f1;p=openwrt%2Fstaging%2Fblogic.git

Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  fix sg_phys to use dma_addr_t
  ub: add sg_init_table for sense and read capacity commands
  x86: pci-gart fix
  blackfin: fix sg fallout
  xtensa: dma-mapping.h is using linux/scatterlist.h functions, so include it
  SG: audit of drivers that use blk_rq_map_sg()
  arch/um/drivers/ubd_kern.c: fix a building error
  SG: Change sg_set_page() to take length and offset argument
  AVR32: Fix sg_page breakage
  mmc: sg fallout
  m68k: sg fallout
  More SG build fixes
  sg: add missing sg_init_table calls to zfcp
  SG build fix
---

7f1495745347bc2cb9cc4f50d0a889caeb71f1f1