Hi Grant,
Today's linux-next merge of the spi tree got a conflict in
drivers/spi/spi-xcomm.c between commit b31659004337 ("spi: Add
AD-FMCOMMS1-EBZ I2C-SPI bridge driver") from Linus' tree and commit
0e312dcca718 ("spi/xcomm: Add AD-FMCOMMS1-EBZ I2C-SPI bridge driver")
from the spi tree.
OK, so the former commit added this driver back before v3.6-rc1 with an
author date of 2012-07-20, the latter is adding a slightly modified
version of the dirver with an author date of 2012-05-22.
I used the former version , please sort this out.
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpLwKdtGmNI8.pgp
Description: PGP signature
