diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 10:49:16 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-15 10:49:16 -0700 |
| commit | 27d2a8b97ebc4467e47722415b81ebe72d5f654f (patch) | |
| tree | 043cbe45ba6ecc6a0bc714aee4e03e3cec097645 | |
| parent | 010b8f4e264b0b6f596186574956dde2fa02df1c (diff) | |
| parent | 44e69767cb7c3bc46e5370c39532c205d4347d80 (diff) | |
| parent | 51de69523ffe1c17994dc2f260369f29dfdce71c (diff) | |
| parent | 44b46c3ef805793ab3a7730dc71c72d0f258ea8e (diff) | |
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