Subject: linux-next: manual merge of the staging tree with the pcmcia tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 9 Nov 2009 18:15:27 +1100

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_mio_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commit
bd7881ee58045b4b684f4400b24081656e0c6986 ("Staging: comedi: ni_mio_cs.c:
coding style cleanup") from the staging tree.

I fixed it up (mainly using the pcmcia tree version when there was a
clash) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    [email-masked]