Merge remote-tracking branch 'y2038/y2038'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:25:04 +0000 (15:25 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 5 Nov 2015 04:25:04 +0000 (15:25 +1100)
1  2 
drivers/staging/gdm72xx/gdm_sdio.c
drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/media/lirc/lirc_serial.c
kernel/cpuset.c

Simple merge
diff --cc kernel/cpuset.c
Simple merge