From: James Bottomley <jejb@sparkweed.localdomain>
Date: Sun, 24 Sep 2006 02:03:52 +0000 (-0500)
Subject: Merge mulgrave-w:git/linux-2.6
X-Git-Tag: v2.6.19-rc1~1266^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1aedf2ccc60fade26c46fae12e28664d0da3f199;p=pandora-kernel.git

Merge mulgrave-w:git/linux-2.6

Conflicts:

	include/linux/blkdev.h

Trivial merge to incorporate tag prototypes.
---

1aedf2ccc60fade26c46fae12e28664d0da3f199
Reading git-diff-tree failed