From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 20 Jun 2007 21:40:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v2.6.22-rc6~71
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=044f620ac65d0d90727cdbd0c058e4d150d62ddc;p=linux-2.6

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] Don't drag a platform specific header into generic arch code.
---

044f620ac65d0d90727cdbd0c058e4d150d62ddc