]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek into...
authorSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:16:40 +0000 (14:16 -0700)
committerSantosh Shilimkar <santosh.shilimkar@oracle.com>
Thu, 17 Sep 2015 21:16:40 +0000 (14:16 -0700)
* 'topic/uek-4.1/uek-carry' of git://ca-git.us.oracle.com/linux-uek:
  bonding: If IP route look-up to send an ARP fails, mark in bonding structure as no ARP sent.
  xen/fpu: stts() before the local_irq_enable(), and clts() after the local_irq_disable().
  Revert "x86, fpu: Avoid possible error in math_state_restore()"


Trivial merge