From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Apr 2008 14:45:45 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
X-Git-Tag: v2.6.25~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6af74b03e00fc78806f75f6701b24b582bbb5c96;p=pandora-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:
  block: update git url for blktrace
  io context: increment task attachment count in ioc_task_link()
---

6af74b03e00fc78806f75f6701b24b582bbb5c96
Reading git-diff-tree failed