diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 14:42:58 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-04 14:42:58 -0700 |
| commit | 3a143125ddc4e2e0ca1e67fb4bedd45c36e59cc7 (patch) | |
| tree | 0e5bc6fcc66b4cbfef909646b8a6b8f7f9d08956 /mm/memcontrol.c | |
| parent | a1aa758d0019f2ac4ea558b3987a07c12fa19f61 (diff) | |
| parent | 5761d64b277c287a7520b868c32d656ef03374b4 (diff) | |
| download | linux-3a143125ddc4e2e0ca1e67fb4bedd45c36e59cc7.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86:
x86: revert assign IRQs to hpet timer
x86: tsc prevent time going backwards
xen: Clear PG_pinned in release_{pt,pd}()
xen: Do not pin/unpin PMD pages
xen: refactor xen_{alloc,release}_{pt,pd}()
x86, agpgart: scary messages are fortunately obsolete
xen: fix grant table bug
x86: fix breakage of vSMP irq operations
x86: print message if nmi_watchdog=2 cannot be enabled
x86: fix nmi_watchdog=2 on Pentium-D CPUs
Diffstat (limited to 'mm/memcontrol.c')
0 files changed, 0 insertions, 0 deletions