]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'y2038/y2038'
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:28:53 +0000 (18:28 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Thu, 9 Apr 2015 08:28:53 +0000 (18:28 +1000)
commitce18995f0c7d619508c43298b77c97a953620018
tree10ee69c6fa2fddccc273916109c7e8f13efdd469
parentd03e8d811a84c6fd176cd69e9dcba5f2e9f0e11c
parented8c2241c1ae1b64e4a783ae7a2c685c93142a8d
Merge remote-tracking branch 'y2038/y2038'

Conflicts:
drivers/staging/media/lirc/lirc_parallel.c
drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
drivers/staging/ft1000/ft1000-usb/ft1000_debug.c
drivers/staging/ft1000/ft1000-usb/ft1000_hw.c
drivers/staging/gdm72xx/gdm_sdio.c
drivers/staging/media/lirc/lirc_parallel.c
drivers/staging/media/lirc/lirc_sasem.c
drivers/staging/media/lirc/lirc_serial.c
fs/coredump.c
kernel/cpuset.c