]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 17 Aug 2015 18:48:24 +0000 (11:48 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Mon, 17 Aug 2015 18:48:24 +0000 (11:48 -0700)
* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  OVMAPI: port ovmapi.ko to UEK4 from UEK3


Trivial merge