From: David S. Miller <davem@davemloft.net>
Date: Thu, 16 Jan 2014 01:00:47 +0000 (-0800)
Subject: Merge branch 'noprefixroute'
X-Git-Tag: v3.14-rc1~94^2~151
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e5d640239fbb3a543b6151d49656b7573b940fdf;p=linux.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 <davem@davemloft.net>
---

e5d640239fbb3a543b6151d49656b7573b940fdf