Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 17:00:50 +0000 (10:00 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Fri, 11 May 2007 17:00:50 +0000 (10:00 -0700)
commit0c4ea957c6ec953d84cc07346437abe0ae4bb57d
treeaea0141a8afb37743604aa909c6ea7362367ae25
parentf2c60ed038dedcc43a0eb3ef4e0602741ba90384
parentdf9f54084f1faf611cedd846d38b0631f9d4e9a5
Merge branch 'upstream' of git://ftp.linux-mips.org/upstream-ip22

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