From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2008 18:41:10 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: v3.12-rc1~18248
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=69849375d6b13e94d08cdc94b49b11fbab454a0e;p=kernel%2Fkernel-generic.git

Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  [MIPS] Sibyte: Register PIO PATA device only for Swarm and Litte Sur
---

69849375d6b13e94d08cdc94b49b11fbab454a0e