tree 0c7734b5cb859d62720c18afdf3fe144b5cce5ff
parent 646fd12784d506180353005f40f90bcf08c84a3e
parent 11a57153e3377ffdf8cfca2eda9a99063f66b957
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1200080699 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1200080699 -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:
  blktrace: kill the unneeded initcall
  block: fix blktrace timestamps
  loop: fix bad bio_alloc() nr_iovec request
  Don't blatt first element of prv in sg_chain()