]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch 'stable/xen-network-3.3.rebase' into uek2-merge
authorKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 19 Apr 2012 21:39:20 +0000 (17:39 -0400)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 19 Apr 2012 21:39:20 +0000 (17:39 -0400)
commitff9430d57bf6b6c91b97e3f818b0ce23de53dc3c
treebc0afa8c2402d564fe6fe74f924f71a11bae56b7
parentb62627eeb69b3f8ad16ff765d700bb056300aa8d
parent6d6b15c9227c63520b2cefd3a20272c8fe10a8a0
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