diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:07:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-18 08:07:54 -0800 |
| commit | ab320af2244462703455dac59fe5ceede24d3662 (patch) | |
| tree | fed3f31755d2c69a3c9f05e64f192dae208b208a /arch/x86/include/asm/page.h | |
| parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
| parent | d1d47ec6e62ab08d2ebb925fd9203abfad3adfbf (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
powerpc/85xx: Fix SMP when "cpu-release-addr" is in lowmem
powerpc/85xx: Fix oops during MSI driver probe on MPC85xxMDS boards
Diffstat (limited to 'arch/x86/include/asm/page.h')
0 files changed, 0 insertions, 0 deletions