Merge branch 'for-2639/i2c/i2c-u2c12' into for-linus/2639/i2c-12

[pandora-kernel.git] / Documentation / feature-removal-schedule.txt

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index a9c4245..f487c69 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -643,6 +643,5 @@ When:       2012
 Why:   superseded by xt_addrtype
 Who:   Florian Westphal <fw@strlen.de>
 Files: include/linux/netfilter_ipv4/ipt_addrtype.h
->>>>>>> 2f5dc63123905a89d4260ab8ee08d19ec104db04
 
 ----------------------------