| commit | 0c4ea957c6ec953d84cc07346437abe0ae4bb57d | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 11 10:00:50 2007 -0700 |
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | Fri May 11 10:00:50 2007 -0700 |
| tree | aea0141a8afb37743604aa909c6ea7362367ae25 | |
| parent | f2c60ed038dedcc43a0eb3ef4e0602741ba90384 [diff] | |
| parent | df9f54084f1faf611cedd846d38b0631f9d4e9a5 [diff] |
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.