From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 24 Jul 2011 16:06:47 +0000 (-0700)
Subject: Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v3.1-rc1~265
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c61264f98c1a974ee6f545f61a4ab33b141d6bda;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'upstream/xen-tracing2' of git://git./linux/kernel/git/jeremy/xen

* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/trace: use class for multicall trace
  xen/trace: convert mmu events to use DECLARE_EVENT_CLASS()/DEFINE_EVENT()
  xen/multicall: move *idx fields to start of mc_buffer
  xen/multicall: special-case singleton hypercalls
  xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
  xen/multicalls: disable MC_DEBUG
  xen/mmu: tune pgtable alloc/release
  xen/mmu: use extend_args for more mmuext updates
  xen/trace: add tlb flush tracepoints
  xen/trace: add segment desc tracing
  xen/trace: add xen_pgd_(un)pin tracepoints
  xen/trace: add ptpage alloc/release tracepoints
  xen/trace: add mmu tracepoints
  xen/trace: add multicall tracing
  xen/trace: set up tracepoint skeleton
  xen/multicalls: remove debugfs stats
  trace/xen: add skeleton for Xen trace events
---

c61264f98c1a974ee6f545f61a4ab33b141d6bda