From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Sun, 29 Jul 2007 02:31:13 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: Ubuntu-5.0.0-8.9~40359
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e;p=mirror_ubuntu-disco-kernel.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:
  docbook: add pipes, other fixes
  blktrace: use cpu_clock() instead of sched_clock()
  bsg: Fix build for CONFIG_BLOCK=n
  [patch] QUEUE_FLAG_READFULL QUEUE_FLAG_WRITEFULL comment fix
---

8e8ef2971b0fd6dcf1a66014fb74b41938eecb4e