diff options
| author | Linus Torvalds | 2013-02-19 20:11:07 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2013-02-19 20:11:07 -0800 |
| commit | f98982ce80f9ce6db0fe841c1844cbae0a2700fb (patch) | |
| tree | 9a6edd811b9b67a80b8a58b57c38dd69e68f6e03 /MAINTAINERS | |
| parent | 29d50523298eb80742cedd9ec4d42d6d6dbfb5ee (diff) | |
| parent | 7d0291256ca99cbb6124f63228003329e7a64b21 (diff) | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform changes from Ingo Molnar:
- Support for the Technologic Systems TS-5500 platform, by Vivien
Didelot
- Improved NUMA support on AMD systems:
Add support for federated systems where multiple memory controllers
can exist and see each other over multiple PCI domains. This
basically means that AMD node ids can be more than 8 now and the code
handling this is taught to incorporate PCI domain into those IDs.
- Support for the Goldfish virtual Android emulator, by Jun Nakajima,
Intel, Google, et al.
- Misc fixlets.
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Add TS-5500 platform support
x86/srat: Simplify memory affinity init error handling
x86/apb/timer: Remove unnecessary "if"
goldfish: platform device for x86
amd64_edac: Fix type usage in NB IDs and memory ranges
amd64_edac: Fix PCI function lookup
x86, AMD, NB: Use u16 for northbridge IDs in amd_get_nb_id
x86, AMD, NB: Add multi-domain support
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 168590fc0d5d..526fb85f2f7e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7533,6 +7533,11 @@ F: drivers/net/team/ F: include/linux/if_team.h F: include/uapi/linux/if_team.h +TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT +M: Savoir-faire Linux Inc. <kernel@savoirfairelinux.com> +S: Maintained +F: arch/x86/platform/ts5500/ + TECHNOTREND USB IR RECEIVER M: Sean Young <sean@mess.org> L: linux-media@vger.kernel.org |