From: David S. Miller <davem@davemloft.net>
Date: Thu, 4 Jun 2015 06:47:24 +0000 (-0700)
Subject: Merge branch 'switchdev-next'
X-Git-Tag: v4.14-rc1~5205^2~138
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=37c8e2b069c7ccff3ff6a356f82ed11abab5fb99;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'switchdev-next'

Scott Feldman says:

====================
switchdev: documentation updates

Update the switchdev documentation to clarify that for IPV4 FIB object, the add
op is used for both adding and modifying the FIB entry on the device.

I found a few other white-space and grammer issues to fix, and to clarify the
static FDB ops.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
---

37c8e2b069c7ccff3ff6a356f82ed11abab5fb99