diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 17:15:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-12 17:15:21 -0400 |
commit | ecca5c3acc0d0933d89abc44e60afb0cc8170e35 (patch) | |
tree | e765a76f8bf07717b4c446193bc4e2601b4fd038 /MAINTAINERS | |
parent | 174808af90a06ee59ffedd60c00c252f1f887f25 (diff) | |
parent | 026ee1f66aaa7f01b617a0ba89ac4b531f9603f1 (diff) |
Merge branch 'akpm' (Andrew's patch-bomb)
Merge fixes from Andrew Morton.
* emailed from Andrew Morton <akpm@linux-foundation.org>: (14 patches)
panic: fix stack dump print on direct call to panic()
drivers/rtc/rtc-pl031.c: enable clock on all ST variants
Revert "mm: vmscan: fix misused nr_reclaimed in shrink_mem_cgroup_zone()"
hugetlb: fix race condition in hugetlb_fault()
drivers/rtc/rtc-twl.c: use static register while reading time
drivers/rtc/rtc-s3c.c: add placeholder for driver private data
drivers/rtc/rtc-s3c.c: fix compilation error
MAINTAINERS: add PCDP console maintainer
memcg: do not open code accesses to res_counter members
drivers/rtc/rtc-efi.c: fix section mismatch warning
drivers/rtc/rtc-r9701.c: reset registers if invalid values are detected
drivers/char/random.c: fix boot id uniqueness race
memcg: fix broken boolen expression
memcg: fix up documentation on global LRU
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f08bac96c431..32671e00800d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -5117,6 +5117,11 @@ F: drivers/i2c/busses/i2c-pca-* | |||
5117 | F: include/linux/i2c-algo-pca.h | 5117 | F: include/linux/i2c-algo-pca.h |
5118 | F: include/linux/i2c-pca-platform.h | 5118 | F: include/linux/i2c-pca-platform.h |
5119 | 5119 | ||
5120 | PCDP - PRIMARY CONSOLE AND DEBUG PORT | ||
5121 | M: Khalid Aziz <khalid.aziz@hp.com> | ||
5122 | S: Maintained | ||
5123 | F: drivers/firmware/pcdp.* | ||
5124 | |||
5120 | PCI ERROR RECOVERY | 5125 | PCI ERROR RECOVERY |
5121 | M: Linas Vepstas <linasvepstas@gmail.com> | 5126 | M: Linas Vepstas <linasvepstas@gmail.com> |
5122 | L: linux-pci@vger.kernel.org | 5127 | L: linux-pci@vger.kernel.org |