tree aea0141a8afb37743604aa909c6ea7362367ae25
parent f2c60ed038dedcc43a0eb3ef4e0602741ba90384
parent df9f54084f1faf611cedd846d38b0631f9d4e9a5
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1178902850 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1178902850 -0700

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.