]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitcd66253315ca2b0bcd5e53f320b42cd0559f332d
tree043cbe45ba6ecc6a0bc714aee4e03e3cec097645
parent025adb830180e12fe2448270e7748687d660f1cc
parent1b57fb76ba72dd211e8ed98cc7ce84205eca09e8
parentd23f1c35f43b3aa6c5c9a7cf449c91d278d47858
parent661cc85f110299ff85a21ff32d223bf6f07cfc80
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git://git.kernel.org/pub/scm/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