]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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)
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-ip22:
  Convert SGI IP22 and specific drivers to platform_device.


Trivial merge