diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 20:40:48 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-20 20:40:48 +0100 |
| commit | 455ba0c0b7e1d2c72a45808115ef35512e3ae7b0 (patch) | |
| tree | da5f3632a45273f970262591a9591857e5611afe /drivers/oprofile/oprofile_files.c | |
| parent | Merge branch 'sh-fixes-for-linus' of git://github.com/pmundt/linux-sh (diff) | |
| parent | Revert "xen/pv-on-hvm kexec: add xs_reset_watches to shutdown watches from ol... (diff) | |
| download | linux-455ba0c0b7e1d2c72a45808115ef35512e3ae7b0.tar.xz linux-455ba0c0b7e1d2c72a45808115ef35512e3ae7b0.zip | |
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"
Diffstat (limited to 'drivers/oprofile/oprofile_files.c')
0 files changed, 0 insertions, 0 deletions