From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 19 Apr 2012 21:39:20 +0000 (-0400)
Subject: Merge branch 'stable/xen-network-3.3.rebase' into uek2-merge
X-Git-Tag: v2.6.39-400.9.0~543^2~18
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=ff9430d57bf6b6c91b97e3f818b0ce23de53dc3c;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/xen-network-3.3.rebase' into uek2-merge

* stable/xen-network-3.3.rebase:
  xen-netback: make ops structs const
  netback: fix typo in comment
  netback: remove redundant assignment
  netback: Fix alert message.
  xen-netback: use correct index for invalidation in xen_netbk_tx_check_gop()
  net: xen-netback: correctly restart Tx after a VM restore/migrate
  xen/netback: Add module alias for autoloading
---

ff9430d57bf6b6c91b97e3f818b0ce23de53dc3c