From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Sun, 6 Aug 2006 17:42:33 +0000 (-0500)
Subject: Merge ../linux-2.6
X-Git-Tag: v2.6.18-rc5~57^2~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=00dd7b7d26a3bf3780cfcebfdde2b86126b3a082;p=linux-2.6

Merge ../linux-2.6

Conflicts:

	arch/ia64/hp/sim/simscsi.c

Stylistic differences in two separate fixes for buffer->request_buffer
problem.

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
---

00dd7b7d26a3bf3780cfcebfdde2b86126b3a082