]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
projects / users / jedix / linux-maple.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d608b3 e7fdc02)
Merge branch 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek into uek...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:16:51 +0000 (14:16 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:16:51 +0000 (14:16 -0700)
* '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.

1  2 
Documentation/kernel-parameters.txt patch | diff1 | diff2 | blob | history
arch/sparc/Kconfig patch | diff1 | diff2 | blob | history

diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc arch/sparc/Kconfig
Simple merge
Unnamed repository; edit this file 'description' to name the repository.