[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20091109181534.c844974d.sfr@canb.auug.org.au>
Date: Mon, 9 Nov 2009 18:15:34 +1100
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Greg KH <greg@...ah.com>
Cc: linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
Bart Massey <bart@...pdx.edu>,
Dominik Brodowski <linux@...inikbrodowski.net>
Subject: linux-next: manual merge of the staging tree with the pcmcia tree
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/comedi/drivers/ni_labpc_cs.c between commit
4e338b7f55b4c30e60fa3fa9ff3d21e930f40116 ("pcmcia/staging: update comedi
drivers") from the pcmcia tree and commits
c22f24e5f0ed5a45e4b339577a1151c4bbb8977a ("Staging: comedi: ni_labpc_cs:
added mandatory whitespace to comparison") and
f195fbc2466c79cda709074fdbb969079e0787e0 ("Staging: comedi: ni_labpc_cs:
wrapped long comments") from the staging tree.
I fixed it up (using the pcmcia tree version where there was a clash) and
can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists