From: James Bottomley <jejb@titanic.(none)>
Date: Thu, 10 Nov 2005 14:29:07 +0000 (-0600)
Subject: Merge by hand (whitespace conflicts in libata.h)
X-Git-Tag: v2.6.15-rc1~7^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a87a0b6313109d2fea87b1271d497c954ce2ca8;p=linux-2.6

Merge by hand (whitespace conflicts in libata.h)

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

8a87a0b6313109d2fea87b1271d497c954ce2ca8