diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 13:09:48 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 13:09:48 -0500 |
| commit | ae5cfc0546ca2698b9dcddf72accbd70e57590a0 (patch) | |
| tree | eb0fcb5ed1dbfbfe7a3c8ac564a42144b5eed88b /drivers/cpuidle | |
| parent | 3dcf6c1b6b29f327ec24a1986aaa8eba399b463f (diff) | |
| parent | dc6821e0cfe74802aefd2067b40fcdc03fc4599e (diff) | |
Merge branch 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
* 'stable/for-linus-fixes-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
xen/mmu: Fix compile errors introduced by x86/memblock mismerge.
Diffstat (limited to 'drivers/cpuidle')
0 files changed, 0 insertions, 0 deletions