| commit | b8cb48aae1b8c50b37dcb7710363aa69a7a0d9ca | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 10:23:49 2009 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 10:23:49 2009 -0700 |
| tree | c7b04bfc8ece8b0121a9030c7f49e7bf9bf570d1 | |
| parent | 0cc6d77e55eca9557bbe41bf2db94b31aa8fcb2a [diff] | |
| parent | 78c86e5e5691fc84d5fbea0cd4ac7147e87b7490 [diff] |
Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: split __phys_addr out into separate file xen: use stronger barrier after unlocking lock xen: only enable interrupts while actually blocking for spinlock xen: make -fstack-protector work under Xen