From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Fri, 11 May 2007 17:00:50 +0000 (-0700)
Subject: Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22
X-Git-Tag: v2.6.22-rc1~29
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0c4ea957c6ec953d84cc07346437abe0ae4bb57d;p=linux.git

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22:
  Convert SGI IP22 and specific drivers to platform_device.
---

0c4ea957c6ec953d84cc07346437abe0ae4bb57d