diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-18 22:05:00 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-18 22:05:00 -0500 |
commit | 86fbf1617a6522379815d34b90fef2aa9068f89d (patch) | |
tree | 5282028f32ec63b16c81968050b3648a766c13c1 /MAINTAINERS | |
parent | a36c160cbbf35aaabf47916e5ea39c519aa80068 (diff) | |
parent | 98398c32f6687ee1e1f3ae084effb4b75adb0747 (diff) |
Merge branch 'akpm' (incoming from Andrew)
Merge patches from Andrew Morton:
"23 fixes and a MAINTAINERS update"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (24 commits)
mm/hugetlb: check for pte NULL pointer in __page_check_address()
fix build with make 3.80
mm/mempolicy: fix !vma in new_vma_page()
MAINTAINERS: add Davidlohr as GPT maintainer
mm/memory-failure.c: recheck PageHuge() after hugetlb page migrate successfully
mm/compaction: respect ignore_skip_hint in update_pageblock_skip
mm/mempolicy: correct putback method for isolate pages if failed
mm: add missing dependency in Kconfig
sh: always link in helper functions extracted from libgcc
mm: page_alloc: exclude unreclaimable allocations from zone fairness policy
mm: numa: defer TLB flush for THP migration as long as possible
mm: numa: guarantee that tlb_flush_pending updates are visible before page table updates
mm: fix TLB flush race between migration, and change_protection_range
mm: numa: avoid unnecessary disruption of NUMA hinting during migration
mm: numa: clear numa hinting information on mprotect
sched: numa: skip inaccessible VMAs
mm: numa: avoid unnecessary work on the failure path
mm: numa: ensure anon_vma is locked to prevent parallel THP splits
mm: numa: do not clear PTE for pte_numa update
mm: numa: do not clear PMD during PTE update scan
...
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 49c3674294a1..52f761733bfe 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
@@ -3833,6 +3833,12 @@ T: git git://linuxtv.org/media_tree.git | |||
3833 | S: Maintained | 3833 | S: Maintained |
3834 | F: drivers/media/usb/gspca/ | 3834 | F: drivers/media/usb/gspca/ |
3835 | 3835 | ||
3836 | GUID PARTITION TABLE (GPT) | ||
3837 | M: Davidlohr Bueso <davidlohr@hp.com> | ||
3838 | L: linux-efi@vger.kernel.org | ||
3839 | S: Maintained | ||
3840 | F: block/partitions/efi.* | ||
3841 | |||
3836 | STK1160 USB VIDEO CAPTURE DRIVER | 3842 | STK1160 USB VIDEO CAPTURE DRIVER |
3837 | M: Ezequiel Garcia <elezegarcia@gmail.com> | 3843 | M: Ezequiel Garcia <elezegarcia@gmail.com> |
3838 | L: linux-media@vger.kernel.org | 3844 | L: linux-media@vger.kernel.org |