tree 644c65b44f551e29341d5efab6b309ff1e6782f2
parent 5c46010af210712c8a390c7fe50ff05448983061
parent 40bee44eaef91b6030037c8bb47f909181fb1edc
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1175011549 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1175011549 -0700

Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
  Export __splice_from_pipe()
  2/2 splice: dont readpage
  1/2 splice: dont steal
  make elv_register() output atomic
  block: blk_max_pfn is somtimes wrong