From: David S. Miller Date: Thu, 16 Jan 2014 01:00:47 +0000 (-0800) Subject: Merge branch 'noprefixroute' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e5d640239fbb3a543b6151d49656b7573b940fdf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'noprefixroute' Thomas Haller says: ==================== ipv6 addrconf: add IFA_F_NOPREFIXROUTE flag to suppress creation of IP6 routes v1 -> v2: add a second commit, handling NOPREFIXROUTE in ip6_del_addr. v2 -> v3: reword commit messages, code comments and some refactoring. v3 -> v4: refactor, rename variables, add enum v4 -> v5: rebase, so that patch applies cleanly to current net-next/master ==================== Signed-off-by: David S. Miller --- e5d640239fbb3a543b6151d49656b7573b940fdf