Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 15:05:37 +0000 (08:05 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 May 2009 15:05:37 +0000 (08:05 -0700)
* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  Revert "mm: add /proc controls for pdflush threads"
  viocd: needs to depend on BLOCK
  block: fix the bio_vec array index out-of-bounds test


Trivial merge