diff options
| author | David S. Miller <davem@davemloft.net> | 2014-06-04 08:32:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-06-04 08:32:12 +0200 |
| commit | c99f7abf0e69987e4add567e155e042cb1f2a20b (patch) | |
| tree | d23898dc30ed25c1dae9bb6325041027d412397a /MAINTAINERS | |
| parent | net: remove some unless free on failure in alloc_netdev_mqs() (diff) | |
| parent | sh_eth: fix SH7619/771x support (diff) | |
| download | linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.tar.xz linux-c99f7abf0e69987e4add567e155e042cb1f2a20b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
include/net/inetpeer.h
net/ipv6/output_core.c
Changes in net were fixing bugs in code removed in net-next.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index dd33abf44766..a3287090f12c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3158,10 +3158,9 @@ S: Maintained F: drivers/scsi/eata_pio.* EBTABLES -M: Bart De Schuymer <bart.de.schuymer@pandora.be> L: netfilter-devel@vger.kernel.org W: http://ebtables.sourceforge.net/ -S: Maintained +S: Orphan F: include/linux/netfilter_bridge/ebt_*.h F: include/uapi/linux/netfilter_bridge/ebt_*.h F: net/bridge/netfilter/ebt*.c @@ -7410,6 +7409,14 @@ F: drivers/rpmsg/ F: Documentation/rpmsg.txt F: include/linux/rpmsg.h +RESET CONTROLLER FRAMEWORK +M: Philipp Zabel <p.zabel@pengutronix.de> +S: Maintained +F: drivers/reset/ +F: Documentation/devicetree/bindings/reset/ +F: include/linux/reset.h +F: include/linux/reset-controller.h + RFKILL M: Johannes Berg <johannes@sipsolutions.net> L: linux-wireless@vger.kernel.org |