summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-08-25 08:56:22 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-08-25 08:56:22 +0200
commitc0bb80cfa3c37fd92f066e328d83656067519a5f (patch)
treefad29579615daaf7d36364e4b45702db0c709044 /MAINTAINERS
parentadfaf18334cbf16c563e4ebc67e968ea1b17ec51 (diff)
parentecda85e70277ef24e44a1f6bc00243cebd19f985 (diff)
downloadop-kernel-dev-c0bb80cfa3c37fd92f066e328d83656067519a5f.zip
op-kernel-dev-c0bb80cfa3c37fd92f066e328d83656067519a5f.tar.gz
Merge branch 'x86/asm' into x86/apic
Pick up dependent changes to avoid merge conflicts
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS11
1 files changed, 0 insertions, 11 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1c3feff..f4a475b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7639,17 +7639,6 @@ T: git git://linuxtv.org/mkrufky/tuners.git
S: Maintained
F: drivers/media/dvb-frontends/lgdt3305.*
-LGUEST
-M: Rusty Russell <rusty@rustcorp.com.au>
-L: lguest@lists.ozlabs.org
-W: http://lguest.ozlabs.org/
-S: Odd Fixes
-F: arch/x86/include/asm/lguest*.h
-F: arch/x86/lguest/
-F: drivers/lguest/
-F: include/linux/lguest*.h
-F: tools/lguest/
-
LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
M: Viresh Kumar <vireshk@kernel.org>
L: linux-ide@vger.kernel.org
OpenPOWER on IntegriCloud