| commit | 455ba0c0b7e1d2c72a45808115ef35512e3ae7b0 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 20 11:40:48 2011 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Dec 20 11:40:48 2011 -0800 |
| tree | da5f3632a45273f970262591a9591857e5611afe | |
| parent | 26957f0e4bb4767c8157a46795cf684426551637 [diff] | |
| parent | 12275dd4b747f5d87fa36229774d76bca8e63068 [diff] |
Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen * 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen: Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from old kernel"