Hi Greg,
Today's linux-next merge of the staging tree got a conflict in
drivers/staging/westbridge/astoria/arch/arm/plat-omap/include/mach/westbridge/westbridge-omap3-pnand-hal/cyashalomap_kernel.h
drivers/staging/westbridge/astoria/gadget/cyasgadget.h between commit
e44ba033c565 ("treewide: remove duplicate includes") from the trivial
tree and commit 78f23926dff9 ("Staging: delete westbridge code") from the
staging tree.
The latter removes the files, so I did that.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp77kiCGJFya.pgp
Description: PGP signature
