Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Fri, 11 Jul 2014 22:32:15 +0000 (01:32 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Fri, 11 Jul 2014 22:32:15 +0000 (01:32 +0300)
1  2 
arch/x86/include/asm/hugetlb.h
fs/ubifs/file.c
mm/hugetlb.c
mm/memory-failure.c
mm/memory.c
mm/page-writeback.c
mm/vmscan.c

Simple merge
diff --cc fs/ubifs/file.c
Simple merge
diff --cc mm/hugetlb.c
Simple merge
Simple merge
diff --cc mm/memory.c
Simple merge
Simple merge
diff --cc mm/vmscan.c
Simple merge