diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 16:40:31 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-18 16:40:31 -0700 |
| commit | ea2388f2813ec7871c40a8b18afb80b5674d6e1d (patch) | |
| tree | ed2a1e6efac1ea9fe515c97fa5d1811918ecfacd /drivers/clocksource/cadence_ttc_timer.c | |
| parent | 38137a5188b83ddf8b0054f6fb80265878c60888 (diff) | |
| parent | b5a8cad376eebbd8598642697e92a27983aee802 (diff) | |
Merge branch 'akpm' (incoming from Andrew)
Merge misc fixes from Andrew Morton:
"13 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
thp: close race between split and zap huge pages
mm: fix new kernel-doc warning in filemap.c
mm: fix CONFIG_DEBUG_VM_RB description
mm: use paravirt friendly ops for NUMA hinting ptes
mips: export flush_icache_range
mm/hugetlb.c: add cond_resched_lock() in return_unused_surplus_pages()
wait: explain the shadowing and type inconsistencies
Shiraz has moved
Documentation/vm/numa_memory_policy.txt: fix wrong document in numa_memory_policy.txt
powerpc/mm: fix ".__node_distance" undefined
kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()
init/Kconfig: move the trusted keyring config option to general setup
vmscan: reclaim_clean_pages_from_list() must use mod_zone_page_state()
Diffstat (limited to 'drivers/clocksource/cadence_ttc_timer.c')
0 files changed, 0 insertions, 0 deletions