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


I just removed the file.

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at
Please read the FAQ at