From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Thu, 17 Sep 2015 21:16:51 +0000 (-0700)
Subject: Merge branch 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek into uek... 
X-Git-Tag: v4.1.12-92~279
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3c83f540a13ada8f48625fa8f468ccf69b726fe8;p=users%2Fjedix%2Flinux-maple.git

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

* 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek:
  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.
---

3c83f540a13ada8f48625fa8f468ccf69b726fe8