diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-14 21:25:39 -0800 |
commit | c60ecec67ab3f6b5791ef49d502b7a61909aa13e (patch) | |
tree | e8180ad2ec48a6063277ee51cf10dc8541dcac2f /arch/x86/mm/numa_64.c | |
parent | c23f72cae9523d29ff94eec8f30ccbdaf234b20e (diff) | |
parent | 2e4f95822cc17cb7095d50babe2d2fc4c043fa25 (diff) |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Cacheops.h: Fix typo.
[MIPS] Cobalt: Qube1 has no serial port so don't use it
[MIPS] Cobalt: Fix ethernet interrupts for RaQ1
[MIPS] Kconfig fixes for BCM47XX platform
Diffstat (limited to 'arch/x86/mm/numa_64.c')
0 files changed, 0 insertions, 0 deletions