projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3210d19 60c5f08)
Merge branch 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:25:44 +0000 (11:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 22 Aug 2011 18:25:44 +0000 (11:25 -0700)
* 'stable/bug.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/tracing: Fix tracing config option properly
  xen: Do not enable PV IPIs when vector callback not present
  xen/x86: replace order-based range checking of M2P table by linear one
  xen: xen-selfballoon.c needs more header files

1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history
arch/x86/xen/mmu.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc arch/x86/xen/mmu.c
Simple merge
John Crispins staging tree