diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-21 20:38:49 -0500 |
commit | 7c2db36e730ee4facd341679ecb21ee73ba92831 (patch) | |
tree | 75016fba72aaf0581b9263f7fa4c565e6e634f3c /MAINTAINERS | |
parent | 8b5628ab83b671f96ac9f174c1bd51c92589fc82 (diff) | |
parent | a47a376f1c025e23e836c0376813c0424de665c2 (diff) |
Merge branch 'akpm' (incoming from Andrew)
Merge misc patches from Andrew Morton:
- Florian has vanished so I appear to have become fbdev maintainer
again :(
- Joel and Mark are distracted to welcome to the new OCFS2 maintainer
- The backlight queue
- Small core kernel changes
- lib/ updates
- The rtc queue
- Various random bits
* akpm: (164 commits)
rtc: rtc-davinci: use devm_*() functions
rtc: rtc-max8997: use devm_request_threaded_irq()
rtc: rtc-max8907: use devm_request_threaded_irq()
rtc: rtc-da9052: use devm_request_threaded_irq()
rtc: rtc-wm831x: use devm_request_threaded_irq()
rtc: rtc-tps80031: use devm_request_threaded_irq()
rtc: rtc-lp8788: use devm_request_threaded_irq()
rtc: rtc-coh901331: use devm_clk_get()
rtc: rtc-vt8500: use devm_*() functions
rtc: rtc-tps6586x: use devm_request_threaded_irq()
rtc: rtc-imxdi: use devm_clk_get()
rtc: rtc-cmos: use dev_warn()/dev_dbg() instead of printk()/pr_debug()
rtc: rtc-pcf8583: use dev_warn() instead of printk()
rtc: rtc-sun4v: use pr_warn() instead of printk()
rtc: rtc-vr41xx: use dev_info() instead of printk()
rtc: rtc-rs5c313: use pr_err() instead of printk()
rtc: rtc-at91rm9200: use dev_dbg()/dev_err() instead of printk()/pr_debug()
rtc: rtc-rs5c372: use dev_dbg()/dev_warn() instead of printk()/pr_debug()
rtc: rtc-ds2404: use dev_err() instead of printk()
rtc: rtc-efi: use dev_err()/dev_warn()/pr_err() instead of printk()
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index f4da1b8314da..81e4ad85dd5c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -1956,7 +1956,8 @@ F: drivers/misc/* | |||
1956 | 1956 | ||
1957 | CHECKPATCH | 1957 | CHECKPATCH |
1958 | M: Andy Whitcroft <apw@canonical.com> | 1958 | M: Andy Whitcroft <apw@canonical.com> |
1959 | S: Supported | 1959 | M: Joe Perches <joe@perches.com> |
1960 | S: Maintained | ||
1960 | F: scripts/checkpatch.pl | 1961 | F: scripts/checkpatch.pl |
1961 | 1962 | ||
1962 | CHINESE DOCUMENTATION | 1963 | CHINESE DOCUMENTATION |
@@ -5035,6 +5036,10 @@ L: linux-mm@kvack.org | |||
5035 | W: http://www.linux-mm.org | 5036 | W: http://www.linux-mm.org |
5036 | S: Maintained | 5037 | S: Maintained |
5037 | F: include/linux/mm.h | 5038 | F: include/linux/mm.h |
5039 | F: include/linux/gfp.h | ||
5040 | F: include/linux/mmzone.h | ||
5041 | F: include/linux/memory_hotplug.h | ||
5042 | F: include/linux/vmalloc.h | ||
5038 | F: mm/ | 5043 | F: mm/ |
5039 | 5044 | ||
5040 | MEMORY RESOURCE CONTROLLER | 5045 | MEMORY RESOURCE CONTROLLER |