Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2009 15:49:07 +0000 (07:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 4 Mar 2009 15:49:07 +0000 (07:49 -0800)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Run sbc610 USB fixup code only on the appropriate platform.


Trivial merge