diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-12 18:22:10 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-12 18:22:10 -0800 |
commit | 8d2763770c34e8ed771f0be86760eb4485febc05 (patch) | |
tree | 38ca3d44f84b8f575f3378c6be525e559bd314c1 /ipc/shm.c | |
parent | 54fb723cc48db2fde964fb9bb0eaaccf2cf31a9f (diff) | |
parent | 1f14c1ac19aa45118054b6d5425873c5c7fc23a1 (diff) |
Merge branch 'akpm' (fixes from Andrew)
Merge patches from Andrew Morton:
"13 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm: memcg: do not allow task about to OOM kill to bypass the limit
mm: memcg: fix race condition between memcg teardown and swapin
thp: move preallocated PTE page table on move_huge_pmd()
mfd/rtc: s5m: fix register updating by adding regmap for RTC
rtc: s5m: enable IRQ wake during suspend
rtc: s5m: limit endless loop waiting for register update
rtc: s5m: fix unsuccesful IRQ request during probe
drivers/rtc/rtc-s5m.c: fix info->rtc assignment
include/linux/kernel.h: make might_fault() a nop for !MMU
drivers/rtc/rtc-at91rm9200.c: correct alarm over day/month wrap
procfs: also fix proc_reg_get_unmapped_area() for !MMU case
mm: memcg: do not declare OOM from __GFP_NOFAIL allocations
include/linux/hugetlb.h: make isolate_huge_page() an inline
Diffstat (limited to 'ipc/shm.c')
0 files changed, 0 insertions, 0 deletions