| commit | 8c090b6edd3a2050bf5f100dbb74a6ba23432f0a | |
| author | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Thu, 25 Aug 2011 03:43:44 +0000 (25 13:43 +1000) | ||
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | |
| Thu, 25 Aug 2011 03:43:44 +0000 (25 13:43 +1000) | ||
| tree | fdee0bf8b40dd395497df11914b2e0d7d2a3c0ce | treesnapshot (tar.gz zip) |
| parent | ffeb255acf693a67c398fc6e68ec9023232f5e1d | 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 |