diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 17:02:14 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-20 17:02:14 -0800 |
| commit | 8d99641f6c1af806cd5d9e6badce91910219a161 (patch) | |
| tree | ee841f807005a4a6234f6f502a13185d13a34870 /MAINTAINERS | |
| parent | fc887b15d935ead2a00aef5779a18034e7c69ee1 (diff) | |
| parent | 225c8e010f2d17a62aef131e24c6e7c111f36f9b (diff) | |
| download | op-kernel-dev-8d99641f6c1af806cd5d9e6badce91910219a161.zip op-kernel-dev-8d99641f6c1af806cd5d9e6badce91910219a161.tar.gz | |
Merge branch 'akpm'
* akpm:
kernel/smp.c: consolidate writes in smp_call_function_interrupt()
kernel/smp.c: fix smp_call_function_many() SMP race
memcg: correctly order reading PCG_USED and pc->mem_cgroup
backlight: fix 88pm860x_bl macro collision
drivers/leds/ledtrig-gpio.c: make output match input, tighten input checking
MAINTAINERS: update Atmel AT91 entry
mm: fix truncate_setsize() comment
memcg: fix rmdir, force_empty with THP
memcg: fix LRU accounting with THP
memcg: fix USED bit handling at uncharge in THP
memcg: modify accounting function for supporting THP better
fs/direct-io.c: don't try to allocate more than BIO_MAX_PAGES in a bio
mm: compaction: prevent division-by-zero during user-requested compaction
mm/vmscan.c: remove duplicate include of compaction.h
memblock: fix memblock_is_region_memory()
thp: keep highpte mapped until it is no longer needed
kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 2e14fd7..2261749 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -624,11 +624,15 @@ M: Lennert Buytenhek <kernel@wantstofly.org> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/ATMEL AT91RM9200 ARM ARCHITECTURE +ARM/ATMEL AT91RM9200 AND AT91SAM ARM ARCHITECTURES M: Andrew Victor <linux@maxim.org.za> +M: Nicolas Ferre <nicolas.ferre@atmel.com> +M: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) W: http://maxim.org.za/at91_26.html -S: Maintained +W: http://www.linux4sam.org +S: Supported +F: arch/arm/mach-at91/ ARM/BCMRING ARM ARCHITECTURE M: Jiandong Zheng <jdzheng@broadcom.com> |
