Subject: linux-next: manual merge of the ide tree

From: Stephen Rothwell <[email-masked]>
Date: Wed, 9 Jul 2008 12:45:17 +1000

Hi Bart,

Today's linux-next merge of the ide tree got a conflict in
drivers/ide/arm/palm_bk3710.c between commit
ffab6cf44e9058fe75a33aa86386b22e616a8f6f ("palm_bk3710: fix IDECLK period
calculation") from Linus' tree (which is also in the ide tree) and
various commits from the ide tree.

I just used the ide tree version.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/