Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
commit22fb53c943b0ad4f86639bccb7ad8753be8ce435
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 19:48:00 +0000 (11 11:48 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 Jan 2008 19:48:00 +0000 (11 11:48 -0800)
tree6051a0be08c1af5b1047014dbaffdb0fd8e65e8a
parent8dab63761219d7bc6a7d7d3b5f0fca76af5533a5
parente452e94e21e8f4a3c2ff045b301ca21c1f6d03bf
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Replace 40c7869b693b18412491fdcff64682215b739f9e kludge
  [MIPS] Lasat: Fix built in separate object directory.
  [MIPS] Malta: Fix software reset on big endian
  [MIPS] pnx8xxx: move to clocksource
  [MIPS] Wrong CONFIG option prevents setup of DMA zone.