]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch '4.1_sparc' of git://ca-git.us.oracle.com/linux-uek-apais into topic...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 15 Sep 2015 15:36:47 +0000 (08:36 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Tue, 15 Sep 2015 15:36:47 +0000 (08:36 -0700)
* '4.1_sparc' of git://ca-git.us.oracle.com/linux-uek-apais:
  sparc64: vdso: simplify cpu_relax
  vdso: replace current_thread_info when building vDSO rather than diking it out
  sparc64, vdso: Add gettimeofday() and clock_gettime().
  sparc64, vdso: sparc64 vDSO implementation.


Trivial merge