Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:43:21 +0000 (12:43 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sat, 3 Nov 2007 19:43:21 +0000 (12:43 -0700)
commit160acc2e899f26356bde92bc257253b7ca78f0c3
treec60782685ac0fdf4b2d6278c4be639181dd65126
parenta7e1e001f432d5960b929787a2a261cf5a7ddac5
parentc46f2334c84c2b26baa64d42d75ddc5fab38c3dc
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block

* 'sg' of git://git.kernel.dk/linux-2.6-block:
  [SG] Get rid of __sg_mark_end()
  cleanup asm/scatterlist.h includes
  SG: Make sg_init_one() use general table init functions