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)
commit559595a985e106d2fa9f0c79b7f5805453fed593
tree88758ce2126d1cf240f4f93ea98d52bf1e21ce6c
parent5ad8b7d12605e88d1e532061699102797fdefe08
parent368a12117dd8abf6eaefa37c21ac313b517128b9
Merge branch 'merge' of git://git./linux/kernel/git/benh/powerpc

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc: Run sbc610 USB fixup code only on the appropriate platform.