Subject: linux-next: manual merge of the tip tree

From: Thierry Reding <[email-masked]>
Date: Mon, 30 Sep 2013 13:26:11 +0200

Today's linux-next merge of the tip tree got conflicts in

	arch/h8300/include/asm/Kbuild

I just removed the file.

Thanks,
Thierry