commit | cfd74486eace27a0899b30529d01bc1a09a5b973 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 21 13:35:10 2011 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jan 21 13:35:10 2011 -0800 |
tree | b4bb52cf16203b78f1a102567915911f0d1c4b85 | |
parent | a1d3f5b70d13b7035f925de1f2ba0003a04b9ac5 [diff] | |
parent | 8e1b4cf2108488ccfb9a3e7ed7cd85a435e01d4b [diff] |
Merge branch 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/bug-fixes-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: xen: p2m: correctly initialize partial p2m leaf xen: fix non-ANSI function warning in irq.c