Subject: linux-next: manual merge of pcmcia tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 23 Jun 2008 17:32:41 +1000

Hi Dominik,

Today's linux-next merge of the pcmcia tree got a conflict in
drivers/ide/legacy/ide-cs.c between commit
a17bf220231a5061a29a27a99a273246eb3b156e ("pcmcia: add another pata/ide
ID") from Linus' tree and commit f3aa02c57dec52fbe519c51f741e3a94d19dcb4c
("pcmcia: add another pata/ide ID") from the pcmcia tree.

>>From the discussion on LKML, I assume the upstream version is correct and
took that.

-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/