From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 May 2009 15:05:37 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c6538499814d8112c5d4d08570a7cf0758e5f8f5;p=linux-beck.git

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

* '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
---

c6538499814d8112c5d4d08570a7cf0758e5f8f5