Merge remote-tracking branch 'pm/linux-next'

diff --cc arch/m68k/include/asm/thread_info.h
Simple merge

diff --cc drivers/staging/rts_pstor/rtsx.c
Simple merge

diff --cc fs/gfs2/log.c
Simple merge

diff --cc fs/gfs2/quota.c
Simple merge

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/cpu.c
Simple merge

diff --cc kernel/exit.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc net/sunrpc/sched.c
Simple merge