diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 01:01:55 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 01:01:55 +0100 |
commit | 891cbd30ef456664e50bbd28436ef3006a81cf7c (patch) | |
tree | 081fa8ec6c2168acc7ee428857b545540055df76 /drivers/tty/tty_ldisc.c | |
parent | Merge branch 'stable/xen-pcifront-fixes' of git://git.kernel.org/pub/scm/linu... (diff) | |
parent | xen: do not release any memory under 1M in domain 0 (diff) | |
download | linux-891cbd30ef456664e50bbd28436ef3006a81cf7c.tar.xz linux-891cbd30ef456664e50bbd28436ef3006a81cf7c.zip |
Merge branch 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
* 'upstream/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
xen: do not release any memory under 1M in domain 0
xen: events: do not unmask event channels on resume
xen: correct size of level2_kernel_pgt
Diffstat (limited to 'drivers/tty/tty_ldisc.c')
0 files changed, 0 insertions, 0 deletions