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-Url: https://git.stricted.de/?a=commitdiff_plain;h=00dd7b7d26a3bf3780cfcebfdde2b86126b3a082;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

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