diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-06-08 20:48:20 +0200 |
| commit | 9dda1658a9bd450d65da5153a2427955785d17c2 (patch) | |
| tree | c563b728d879c2b446a8f1c33ce351ffb1f1d34e /MAINTAINERS | |
| parent | b72e7464e4cf80117938e6adb8c22fdc1ca46d42 (diff) | |
| parent | a49976d14f780942dafafbbf16f891c27d385ea0 (diff) | |
| download | lwn-9dda1658a9bd450d65da5153a2427955785d17c2.tar.gz lwn-9dda1658a9bd450d65da5153a2427955785d17c2.zip | |
Merge branch 'x86/asm' into x86/core, to prepare for new patch
Collect all changes to arch/x86/entry/entry_64.S, before applying
patch that changes most of the file.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index e30871880fdb..2987968e235c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10893,7 +10893,7 @@ M: Andy Lutomirski <luto@amacapital.net> L: linux-kernel@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/vdso S: Maintained -F: arch/x86/vdso/ +F: arch/x86/entry/vdso/ XC2028/3028 TUNER DRIVER M: Mauro Carvalho Chehab <mchehab@osg.samsung.com> |