Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Mar 2011 17:49:16 +0000 (10:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Mar 2011 17:49:16 +0000 (10:49 -0700)
commit27d2a8b97ebc4467e47722415b81ebe72d5f654f
tree043cbe45ba6ecc6a0bc714aee4e03e3cec097645
parent010b8f4e264b0b6f596186574956dde2fa02df1c
parent44e69767cb7c3bc46e5370c39532c205d4347d80
parent51de69523ffe1c17994dc2f260369f29dfdce71c
parent44b46c3ef805793ab3a7730dc71c72d0f258ea8e
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git://git./linux/kernel/git/konrad/xen

* 'stable/ia64' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: ia64 build broken due to "xen: switch to new schedop hypercall by default."

* 'stable/blkfront-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: Union the blkif_request request specific fields

* 'stable/cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
  xen: annotate functions which only call into __init at start of day
  xen p2m: annotate variable which appears unused
  xen: events: mark cpu_evtchn_mask_p as __refdata
arch/x86/xen/p2m.c
drivers/xen/events.c