Merge remote-tracking branch 'y2038/y2038'

diff --cc drivers/staging/gdm72xx/gdm_sdio.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_sasem.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge