From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 7 Jan 2008 21:31:03 +0000 (-0800)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.24-rc8~74
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e4c6d3c6b14bd20fb8087acd51b29ee54a66ef77;p=linux-2.6-omap-h63xx.git

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 CONFIG_BOOT_RAW.
  [MIPS] Assume R4000/R4400 newer than 3.0 don't have the mfc0 count bug
  [MIPS] Fix IP32 breakage
  [MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning
  [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place
---

e4c6d3c6b14bd20fb8087acd51b29ee54a66ef77