projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8c8ae4e 110e7c7)
Merge branch 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:48:46 +0000 (08:48 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 10 Jan 2011 16:48:46 +0000 (08:48 -0800)
* 'stable/bug-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen/event: validate irq before get evtchn by irq
  xen/fb: fix potential memory leak
  xen/fb: fix xenfb suspend/resume race.
  xen: disable ACPI NUMA for PV guests
  xen/irq: Cleanup the find_unbound_irq

1  2 
arch/x86/xen/enlighten.c patch | diff1 | diff2 | blob | history
drivers/video/xen-fbfront.c patch | diff1 | diff2 | blob | history
drivers/xen/events.c patch | diff1 | diff2 | blob | history

diff --cc arch/x86/xen/enlighten.c
Simple merge
diff --cc drivers/video/xen-fbfront.c
Simple merge
diff --cc drivers/xen/events.c
Simple merge
John Crispins staging tree