]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
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, 22 Oct 2015 20:54:50 +0000 (13:54 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 22 Oct 2015 20:54:50 +0000 (13:54 -0700)
* 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek:
  sparc: Accommodate mem64_offset != mem_offset in pbm configuration


Trivial merge