tree f783074f1bec1112bf1148a077e0114a38403ad4
parent b73b636e8987f8728c6c700377615757691b9a55
parent f73e2d13a16cc88c4faa4729967f92bfeec8a142
author Linus Torvalds <torvalds@linux-foundation.org> 1224260995 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1224260995 -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:
  block: remove __generic_unplug_device() from exports
  block: move q->unplug_work initialization
  blktrace: pass zfcp driver data
  blktrace: add support for driver data
  block: fix current kernel-doc warnings
  block: only call ->request_fn when the queue is not stopped
  block: simplify string handling in elv_iosched_store()
  block: fix kernel-doc for blk_alloc_devt()
  block: fix nr_phys_segments miscalculation bug
  block: add partition attribute for partition number
  block: add BIG FAT WARNING to CONFIG_DEBUG_BLOCK_EXT_DEVT
  softirq: Add support for triggering softirq work on softirqs.