Merge branch 'switchdev-next'
authorDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 06:47:24 +0000 (23:47 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 4 Jun 2015 06:47:24 +0000 (23:47 -0700)
commit37c8e2b069c7ccff3ff6a356f82ed11abab5fb99
treec09e8d383d5c070d137afe898f589575d74566ff
parent9d1dabfbd0760269475a0cbbcc568505aa3ada60
parent7616dcbb212eeec00c9bcc0fecb953fdee60634c
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>