Merge branch 'master' into for-next

Conflicts:
	include/linux/mmzone.h

Synced with Linus' tree so that trivial patch can be applied
on top of up-to-date code properly.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>

diff --cc include/linux/mmzone.h
index 54631776dff2026c482186682f270c8361d60c20,1b89861eedc0bd296fedcf65e049114568ebcf95..588c5cb2851d54fab04a10f53820880208014d15
--- 1/include/linux/mmzone.h
--- 2/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@@ -185,8 -185,22 +185,22 @@@ static inline int is_unevictable_lru(en
        return (lru == LRU_UNEVICTABLE);
  }
  
 -       * mem/swap backed and file backed pages are refeferenced.
+ struct zone_reclaim_stat {
+       /*
+        * The pageout code in vmscan.c keeps track of how many of the
++       * mem/swap backed and file backed pages are referenced.
+        * The higher the rotated/scanned ratio, the more valuable
+        * that cache is.
+        *
+        * The anon LRU stats live in [0], file LRU stats in [1]
+        */
+       unsigned long           recent_rotated[2];
+       unsigned long           recent_scanned[2];
+ };
+ 
  struct lruvec {
        struct list_head lists[NR_LRU_LISTS];
+       struct zone_reclaim_stat reclaim_stat;
  };
  
  /* Mask used at gathering information at once (see memcontrol.c) */

diff --cc mm/vmscan.c
Simple merge