tree c7ea337b623abacdb546d30a39037dd029f20a34
parent 62f1b494d82272819570d715eb6633887a9fde20
parent 692ebd17c2905313fff3c504c249c6a0faad16ec
author Linus Torvalds <torvalds@linux-foundation.org> 1285171957 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1285171957 -0700

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

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
  bdi: Fix warnings in __mark_inode_dirty for /dev/zero and friends
  char: Mark /dev/zero and /dev/kmem as not capable of writeback
  bdi: Initialize noop_backing_dev_info properly
  cfq-iosched: fix a kernel OOPs when usb key is inserted
  block: fix blk_rq_map_kern bio direction flag
  cciss: freeing uninitialized data on error path