Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 02:47:53 +0000 (19:47 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 28 Sep 2007 02:47:53 +0000 (19:47 -0700)
commitcdfef17d93b35a6d583509945e699ee998abce24
tree2d03d40d14641a2ad6a4269dabc66663fc072e0f
parente4a7b1d1d90d202a030688ab5b177c3c0f15ee3e
parent7d809ba3f98b8aa8f9ba0dcdf6349958a0b77b7b
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
  [MIPS] IP32: Fix initialization of UART base addresses.