Merge branch 'stable-3.2' into pandora-3.2
authorGrazvydas Ignotas <notasas@gmail.com>
Mon, 6 Aug 2012 22:10:39 +0000 (01:10 +0300)
committerGrazvydas Ignotas <notasas@gmail.com>
Mon, 6 Aug 2012 22:10:39 +0000 (01:10 +0300)
1  2 
fs/open.c
fs/splice.c
fs/ubifs/sb.c
include/linux/Kbuild
include/linux/splice.h
kernel/sched.c
mm/shmem.c

diff --cc fs/open.c
Simple merge
diff --cc fs/splice.c
Simple merge
diff --cc fs/ubifs/sb.c
Simple merge
Simple merge
Simple merge
diff --cc kernel/sched.c
Simple merge
diff --cc mm/shmem.c
Simple merge