From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 13 Nov 2015 19:28:39 +0000 (-0800)
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~239
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7034032f475b8f47598c66abd798c0610873787;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: UEK4 LDOMS DOMAIN SERVICES UPDATE 1
  i40e: Look up MAC address in Open Firmware or IDPROM
  sparc64, vdso: update the CLOCK_MONOTONIC_COARSE clock
---

f7034032f475b8f47598c66abd798c0610873787