From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 11 Jan 2008 19:48:00 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=22fb53c943b0ad4f86639bccb7ad8753be8ce435;p=deliverable%2Flinux.git

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.
---

22fb53c943b0ad4f86639bccb7ad8753be8ce435