| commit | 7cc1050a1f3bad890fb79c5e62b0f6e130ca73cd | [log] [tgz] |
|---|---|---|
| author | Arnd Bergmann <arnd@arndb.de> | Wed Jun 18 16:42:05 2014 +0200 |
| committer | Arnd Bergmann <arnd@arndb.de> | Wed Jun 18 16:42:05 2014 +0200 |
| tree | c46ee441fd32269186486c0a6a5814447c6ee13b | |
| parent | e324f9c699672e30d68aec783cf876d2eda553f8 [diff] | |
| parent | 480e2d6d3a169a30dfddc42c8bdd55c3c6ed0f9f [diff] |
Merge branch 'dev/2038' of git://git.linaro.org/people/john.stultz/linux into inode_time Conflicts: kernel/time.c