tree 50c42e2102a542891a15b5011e48fbde14149baf
parent df5b89b323b922f56650b4b4d7c41899b937cf19
parent ae36b883d29e53b6083ed3d1d44f254cee7507d3
author Linus Torvalds <torvalds@g5.osdl.org> 1143478009 -0800
committer Linus Torvalds <torvalds@g5.osdl.org> 1143478009 -0800

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

* 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-block:
  [PATCH] Don't make debugfs depend on DEBUG_KERNEL
  [PATCH] Fix blktrace compile with sysfs not defined
  [PATCH] unused label in drivers/block/cciss.
  [BLOCK] increase size of disk stat counters
  [PATCH] blk_execute_rq_nowait-speedup
  [PATCH] ide-cd: quiet down GPCMD_READ_CDVD_CAPACITY failure
  [BLOCK] ll_rw_blk: kmalloc -> kzalloc conversion
  [PATCH] kzalloc() conversion in drivers/block
  [PATCH] update max_sectors documentation