projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 83858a7 27e0e63)
Merge tag 'for-linus-4.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 18:00:05 +0000 (11:00 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 May 2016 18:00:05 +0000 (11:00 -0700)
commit41143b774af2b37c24026521e6eae4c914bd731d
tree9d71c08967c8047fdbc68177747dd9c62b73394dtree | snapshot
parent83858a701cf3271f81dd321c2a81e5666c6ca8f4commit | diff
parent27e0e6385377c4dc68a4ddaf1a35a2dfa951f3c5commit | diff
Merge tag 'for-linus-4.6-rc6-tag' of git://git./linux/kernel/git/xen/tip

Pull xen regression fixes from David Vrabel:

 - Fix two regressions causing crashes in 32-bit PV guests

 - Fix a regression in the evtchn driver

* tag 'for-linus-4.6-rc6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
  xen/evtchn: fix ring resize when binding new events
  xen/balloon: Fix crash when ballooning on x86 32 bit PAE
  xen: Fix page <-> pfn conversion on 32 bit systems
John Crispins staging tree