tree dc9c0cc41150042224a367ffcab77cf7d315e3a7
parent 1810b6cb162e0c19e0ecbbacbcfd66f578f335ec
parent 3e7ee3e7b36fa4e2d88d8fb0a2577be95fc4636d
author Linus Torvalds <torvalds@g5.osdl.org> 1144012926 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1144012926 -0700

Merge branch 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block

* 'splice' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] splice: fix page stealing LRU handling.
  [PATCH] splice: page stealing needs to wait_on_page_writeback()
  [PATCH] splice: export generic_splice_sendpage
  [PATCH] splice: add a SPLICE_F_MORE flag
  [PATCH] splice: add comments documenting more of the code
  [PATCH] splice: improve writeback and clean up page stealing
  [PATCH] splice: fix shadow[] filling logic