Merge remote-tracking branch 'staging/staging-next'

diff --cc drivers/staging/android/persistent_ram.c
Simple merge

diff --cc drivers/staging/omapdrm/omap_drv.c
Simple merge

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

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

diff --cc drivers/staging/xgifb/vb_init.c
Simple merge

diff --cc drivers/staging/xgifb/vb_setmode.c
Simple merge

diff --cc drivers/staging/xgifb/vb_table.h
Simple merge