]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1
authorChuck Anderson <chuck.anderson@oracle.com>
Tue, 7 Feb 2017 05:57:51 +0000 (21:57 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Tue, 7 Feb 2017 05:57:51 +0000 (21:57 -0800)
commit8a371cd465ddae736e02cb32ab5949124f35969f
tree32eb0407dd0a2eb31eaa23b44ea2b24a152c11bb
parent246333f9d3d3737793e5d9cdfaafdde61c124961
parent2634a56b9972b96e4b75a37f52c8b68a0e6fa79b
Merge branch topic/uek-4.1/xen of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* topic/uek-4.1/xen:
  xen-netback: fix extra_info handling in xenvif_tx_err()