Merge remote-tracking branch 'y2038/y2038'

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

diff --cc drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
index f241a3a,8b95662..be5ddb4
--- 1/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
--- 2/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
+++ b/drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
@@@ -413,22 -413,14 +413,21 @@@ static long ft1000_ioctl(struct file *f
        int i;
        u16 tempword;
        unsigned long flags;
-       struct timeval tv;
        struct IOCTL_GET_VER get_ver_data;
        struct IOCTL_GET_DSP_STAT get_stat_data;
 -      u8 ConnectionMsg[] = {0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64,
 -                            0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0a,
 -                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 -                            0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 -                            0x00, 0x00, 0x02, 0x37, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x7f, 0x00,
 -                            0x00, 0x01, 0x00, 0x00};
 +      u8 ConnectionMsg[] = {
 +              0x00, 0x44, 0x10, 0x20, 0x80, 0x00, 0x00, 0x00,
 +              0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x93, 0x64,
 +              0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
 +              0x00, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x0a,
 +              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02,
 +              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12,
 +              0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
 +              0x00, 0x00, 0x02, 0x37, 0x00, 0x00, 0x00, 0x08,
 +              0x00, 0x00, 0x00, 0x01, 0x00, 0x01, 0x7f, 0x00,
 +              0x00, 0x01, 0x00, 0x00
 +      };
  
        unsigned short ledStat = 0;
        unsigned short conStat = 0;

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