aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Cross2013-03-13 19:16:02 -0500
committerColin Cross2013-03-13 19:16:02 -0500
commit0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f (patch)
tree9bab760a750d9cf4504d92603ee7fc82beeb2e38 /MAINTAINERS
parenta276def548828763cf5ac228adf8c1ca73f8d4d3 (diff)
parente28c3f2b514b5581e15614f7cf976131092cf4b6 (diff)
downloadkernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.gz
kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.tar.xz
kernel-common-0b203ab4aacdb6e6dfb8c277aa290f0a02428e6f.zip
Merge tag 'v3.0.68' into android-3.0
This is the 3.0.68 stable release Conflicts: kernel/cgroup.c Change-Id: I067982d25e18e3a12de93a5eb6429b8829d7ca11
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 74c8e4b73ae..105683a48f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2491,7 +2491,7 @@ S: Maintained
2491F: drivers/net/eexpress.* 2491F: drivers/net/eexpress.*
2492 2492
2493ETHERNET BRIDGE 2493ETHERNET BRIDGE
2494M: Stephen Hemminger <shemminger@linux-foundation.org> 2494M: Stephen Hemminger <stephen@networkplumber.org>
2495L: bridge@lists.linux-foundation.org 2495L: bridge@lists.linux-foundation.org
2496L: netdev@vger.kernel.org 2496L: netdev@vger.kernel.org
2497W: http://www.linuxfoundation.org/en/Net:Bridge 2497W: http://www.linuxfoundation.org/en/Net:Bridge
@@ -4327,7 +4327,7 @@ S: Supported
4327F: drivers/infiniband/hw/nes/ 4327F: drivers/infiniband/hw/nes/
4328 4328
4329NETEM NETWORK EMULATOR 4329NETEM NETWORK EMULATOR
4330M: Stephen Hemminger <shemminger@linux-foundation.org> 4330M: Stephen Hemminger <stephen@networkplumber.org>
4331L: netem@lists.linux-foundation.org 4331L: netem@lists.linux-foundation.org
4332S: Maintained 4332S: Maintained
4333F: net/sched/sch_netem.c 4333F: net/sched/sch_netem.c
@@ -5779,7 +5779,7 @@ S: Maintained
5779F: drivers/usb/misc/sisusbvga/ 5779F: drivers/usb/misc/sisusbvga/
5780 5780
5781SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS 5781SKGE, SKY2 10/100/1000 GIGABIT ETHERNET DRIVERS
5782M: Stephen Hemminger <shemminger@linux-foundation.org> 5782M: Stephen Hemminger <stephen@networkplumber.org>
5783L: netdev@vger.kernel.org 5783L: netdev@vger.kernel.org
5784S: Maintained 5784S: Maintained
5785F: drivers/net/skge.* 5785F: drivers/net/skge.*