projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 017892c 79250af)
Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:56:02 +0000 (10:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:56:02 +0000 (10:56 -0800)
commit37d9a8c5ea8fc063841c133fc53cc168ee620762
treef39b864a636d10bdbda2db2af6f01b69bc6a919ctree | snapshot
parent017892c341033b3e961e695bc0bf1a815efcf92ecommit | diff
parent79250af2d5953b69380a6319b493862bf4ece972commit | diff
Merge branch 'x86-cpu-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Fix included-by file reference comments
  x86, cpu: Only CPU features determine NX capabilities
  x86, cpu: Call verify_cpu during 32bit CPU startup
  x86, cpu: Clear XD_DISABLED flag on Intel to regain NX
  x86, cpu: Rename verify_cpu_64.S to verify_cpu.S
arch/x86/kernel/head_32.S diff1 | diff2 | blob | history
John Crispins staging tree