]> 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>
Fri, 25 Sep 2015 16:51:52 +0000 (09:51 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Fri, 25 Sep 2015 16:51:52 +0000 (09:51 -0700)
* 'topic/uek-4.1/sparc' of git://ca-git.us.oracle.com/linux-uek:
  use SET_NETDEV_DEV() to set up the vdev in vnet_new()
  lib/iommu-common.c: do not try to deref a null iommu->lazy_flush() pointer when n < pool->hint


Trivial merge