| commit | c38b9e9b825d900fb1b07e68a0fa25cc0eb5b8df | [log] [tgz] |
|---|---|---|
| author | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 22:10:48 2015 +1000 |
| committer | Michael Ellerman <mpe@ellerman.id.au> | Fri Jun 05 22:10:48 2015 +1000 |
| tree | 28bc5a3c41ed68df85cb3d93d218750b9ff3578c | |
| parent | 4df5ba7e5abc654561cf4be137134236bab99828 [diff] | |
| parent | ed8c2241c1ae1b64e4a783ae7a2c685c93142a8d [diff] |
Merge remote-tracking branch 'y2038/y2038' Conflicts: drivers/staging/media/lirc/lirc_parallel.c