linux-next: manual merge of the tip tree
From: Thierry Reding
Date: Mon Sep 30 2013 - 07:29:01 EST
Today's linux-next merge of the tip tree got conflicts in
arch/h8300/include/asm/Kbuild
I just removed the file.
Thanks,
Thierry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/