tree b9f5b17cfa23a9620b85359ac6c514b208d299fb
parent ae000eec2c6aa785e1a85bea6e2f612fb826859a
parent 422efb17eee0471baf4e1876ac9e8ba4c9e7a37a
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1191006145 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1191006145 -0700

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] Fix fallocate on o32 binary compat ABI
  [MIPS] Fix CONFIG_BUILD_ELF64 kernels with symbols in CKSEG0.
  [MIPS] IP32: Fix initialization of UART base addresses.