diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 23:03:00 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-01-31 23:03:00 +0100 |
| commit | 0ffbf8bf21db0186e9fbb024a1796c3148790578 (patch) | |
| tree | 8004e1dc2c6893f2aa0b8a2279718a2120fef838 /MAINTAINERS | |
| parent | Staging: rtl8192e: Remove unused card type (diff) | |
| download | linux-0ffbf8bf21db0186e9fbb024a1796c3148790578.tar.xz linux-0ffbf8bf21db0186e9fbb024a1796c3148790578.zip | |
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-- | MAINTAINERS | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 3118d67d68fb..dd6ca456cde3 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> |