diff --git a/[refs] b/[refs] index dc1124921a12..992f262403d3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5dcaba7ed5be7fcedde7732111f31692e2e39ef9 +refs/heads/master: 68653359beb59014b88e4f297e467730a1680996 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 03df1d15ebf3..3064a9c3b3e7 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -3433,13 +3433,14 @@ S: Supported F: drivers/idle/i7300_idle.c IEEE 802.15.4 SUBSYSTEM +M: Alexander Smirnov M: Dmitry Eremin-Solenikov -M: Sergey Lapin L: linux-zigbee-devel@lists.sourceforge.net (moderated for non-subscribers) W: http://apps.sourceforge.net/trac/linux-zigbee T: git git://git.kernel.org/pub/scm/linux/kernel/git/lowpan/lowpan.git S: Maintained F: net/ieee802154/ +F: net/mac802154/ F: drivers/ieee802154/ IIO SUBSYSTEM AND DRIVERS