linux-next: manual merge of the ide tree
From: Stephen Rothwell <hidden>
Date: 2008-07-09 02:45:27
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 sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/ Attachments
- (unnamed) [application/pgp-signature] 197 bytes