linux-next: manual merge of the l2-mtd tree with the mtd tree
From: Stephen Rothwell
Date: Mon Jul 16 2012 - 21:00:32 EST
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.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Description: PGP signature