commit | 1ca949299260aa49eeba34ff912e2321c8b1f647 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 19 17:38:33 2007 -0800 |
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Mon Feb 19 17:38:33 2007 -0800 |
tree | bb23ca6055b30a43c6c6c51c869c66f23180bb48 | |
parent | c9ce228306fda4448f5f495b4f36c07956f45acd [diff] | |
parent | 0cfd5267476ce8051c4447988d2b0377d09188e8 [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] Cobalt: Fix UART I/O type [MIPS] Fixup copy_from_user_inatomic [MIPS] Fix struct sigcontext for N32 userland [MIPS] Make some __setup functions static [MIPS] Declare highstart_pfn, highend_pfn only if CONFIG_HIGHMEM=y [MIPS] Allow selection of KGDB only on platforms where it's supported.