From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Tue, 15 Sep 2015 15:36:47 +0000 (-0700)
Subject: Merge branch '4.1_sparc' of git://ca-git.us.oracle.com/linux-uek-apais into topic... 
X-Git-Tag: v4.1.12-92~279^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=e7fdc0242c14b7af86c9d5e83bff420d1a73c6d3;p=users%2Fjedix%2Flinux-maple.git

Merge branch '4.1_sparc' of git://ca-git.us.oracle.com/linux-uek-apais into topic/uek-4.1/sparc

* '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.
---

e7fdc0242c14b7af86c9d5e83bff420d1a73c6d3