Messages in this thread | | | Date | Tue, 17 Jul 2012 11:00:25 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the l2-mtd tree with the mtd tree |
| |
Hi Artem,
Today's linux-next merge of the l2-mtd tree got a conflict in drivers/mtd/chips/cfi_cmdset_0002.c between commit 420962884379 ("mtd: cfi_cmdset_0002: Micron M29EW bugfixes as per TN-13-07") from the mtd tree and commit 39c0c188e160 ("mtd: cfi_cmdset_0002: Micron M29EW bugfixes as per TN-13-07") from the l2-mtd tree.
I just used the version in the mtd tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [unhandled content-type:application/pgp-signature] | |