From: James Bottomley <jejb@mulgrave.il.steeleye.com>
Date: Sat, 10 Feb 2007 19:45:43 +0000 (-0600)
Subject: Merge branch 'linus'
X-Git-Tag: v2.6.21-rc1~274^2~230^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81b7bbd1932a04869d4c8635a75222dfc6089f96;p=linux-2.6

Merge branch 'linus'

Conflicts:

	drivers/scsi/ipr.c

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

81b7bbd1932a04869d4c8635a75222dfc6089f96