Merge tag 'v3.14.25' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux...

This is the 3.14.25 stable release

* tag 'v3.14.25' of http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable: (123 commits)
  Linux 3.14.25
  mm/page_alloc: prevent MIGRATE_RESERVE pages from being misplaced
  mm: vmscan: use proportional scanning during direct reclaim and full scan at DEF_PRIORITY
  fs/superblock: avoid locking counting inodes and dentries before reclaiming them
  fs/superblock: unregister sb shrinker before ->kill_sb()
  mm: fix direct reclaim writeback regression
  x86/mm: In the PTE swapout page reclaim case clear the accessed bit instead of flushing the TLB
  mm, compaction: properly signal and act upon lock and need_sched() contention
  mm/compaction: avoid rescanning pageblocks in isolate_freepages
  mm/compaction: do not count migratepages when unnecessary
  mm, compaction: terminate async compaction when rescheduling
  mm, compaction: embed migration mode in compact_control
  mm, compaction: add per-zone migration pfn cache for async compaction
  mm, compaction: return failed migration target pages back to freelist
  mm, migration: add destination page freeing callback
  mm/compaction: cleanup isolate_freepages()
  mm/compaction: clean up unused code lines
  mm/readahead.c: inline ra_submit
  callers of iov_copy_from_user_atomic() don't need pagecache_disable()
  mm: remove read_cache_page_async()
  ...

Signed-off-by: Dan Murphy <DMurphy@ti.com>

diff --cc drivers/ata/ahci.c
Simple merge

diff --cc drivers/net/wireless/mac80211_hwsim.c
Simple merge