Messages in this thread | | | Date | Mon, 13 Jan 2014 09:11:41 -0800 | From | Sören Brinkmann <> | Subject | Re: linux-next: manual merge of the mmc tree with Linus' tree |
| |
On Mon, Jan 13, 2014 at 01:17:00PM +1100, Stephen Rothwell wrote: > Hi Chris, > > Today's linux-next merge of the mmc tree got a conflict in MAINTAINERS > between commit c2fd4e380322 ("MAINTAINERS: set up proper record for > Xilinx Zynq") from Linus' tree and commit 45f210424b4b ("mmc: arasan: Add > driver for Arasan SDHCI") from the mmc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
The fix is correct, AFAICT.
Thanks, Sören
-- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |