Merge remote-tracking branch 'y2038/y2038'

Conflicts:
	drivers/staging/media/lirc/lirc_parallel.c

diff --cc drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
Simple merge

diff --cc drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
Simple merge

diff --cc drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
Simple merge

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

diff --cc drivers/staging/media/lirc/lirc_parallel.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 fs/coredump.c
Simple merge

diff --cc kernel/cpuset.c
Simple merge