| commit | 1705a0053fac43b9562ea717d1cf4b2f6ea20acc | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 03:10:11 +0000 (31 13:10 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Wed, 31 Aug 2011 03:10:11 +0000 (31 13:10 +1000) | ||
| tree | ddbc4280d95e652e89d3ff1430156d9efa9db1c3 | treesnapshot (tar.gz zip) |
| parent | 2d0ff10e246b21c9224398629b747285958596ab | commitdiff |
| parent | 9c051b9800227b474dcd448c0520078a81eb8773 | commitdiff |
Merge remote-tracking branch 'tip/auto-latest'
Conflicts:
arch/x86/mm/fault.c
Conflicts:
arch/x86/mm/fault.c
| Documentation/kernel-parameters.txt | diff1 | diff2 | blobhistory |
| arch/x86/xen/mmu.c | diff1 | diff2 | blobhistory |