tree a5b2db24fa361e96efb64442f48e463154a66f8b
parent a771132783d3f78a51597fdcee96c6dfbae3512e
parent 0e435ac26e3f951d83338ed3d4ab7dc0fe0055bc
author Linus Torvalds <torvalds@linux-foundation.org> 1228351556 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1228351556 -0800

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  block: fix setting of max_segment_size and seg_boundary mask
  block: internal dequeue shouldn't start timer
  block: set disk->node_id before it's being used
  When block layer fails to map iov, it calls bio_unmap_user to undo