summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-01-31 14:03:00 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-01-31 14:03:00 -0800
commit0ffbf8bf21db0186e9fbb024a1796c3148790578 (patch)
tree8004e1dc2c6893f2aa0b8a2279718a2120fef838 /MAINTAINERS
parent51da8e2b4e0e4b14e5ec0fd32473dcfc2562b822 (diff)
downloadop-kernel-dev-0ffbf8bf21db0186e9fbb024a1796c3148790578.zip
op-kernel-dev-0ffbf8bf21db0186e9fbb024a1796c3148790578.tar.gz
Revert "appletalk: move to staging"
This reverts commit a6238f21736af3f47bdebf3895f477f5f23f1af9 Appletalk got some patches to fix up the BLK usage in it in the network tree, so this removal isn't needed. Cc: Arnd Bergmann <arnd@arndb.de> Cc: <acme@ghostprotocols.net> Cc: netdev@vger.kernel.org, Cc: David Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS3
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3118d67..dd6ca45 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -554,7 +554,8 @@ F: drivers/hwmon/applesmc.c
APPLETALK NETWORK LAYER
M: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
S: Maintained
-F: drivers/staging/appletalk/
+F: drivers/net/appletalk/
+F: net/appletalk/
ARC FRAMEBUFFER DRIVER
M: Jaya Kumar <jayalk@intworks.biz>
OpenPOWER on IntegriCloud