tree 28bc5a3c41ed68df85cb3d93d218750b9ff3578c
parent 4df5ba7e5abc654561cf4be137134236bab99828
parent ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d
author Michael Ellerman <mpe@ellerman.id.au> 1433506248 +1000
committer Michael Ellerman <mpe@ellerman.id.au> 1433506248 +1000

Merge remote-tracking branch 'y2038/y2038'

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