tree c60782685ac0fdf4b2d6278c4be639181dd65126
parent a7e1e001f432d5960b929787a2a261cf5a7ddac5
parent c46f2334c84c2b26baa64d42d75ddc5fab38c3dc
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1194119001 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1194119001 -0700

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