commit 559595a985e106d2fa9f0c79b7f5805453fed593 Merge: 5ad8b7d... 368a121... Author: Linus Torvalds Date: Wed Mar 4 07:49:07 2009 -0800 Merge branch 'merge' of git://git.kernel.org/pub/scm/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. commit 5ad8b7d12605e88d1e532061699102797fdefe08 Author: Helge Bahmann Date: Wed Mar 4 21:49:14 2009 +1000 drm: fix double lock typo [airlied: you shall not retype patches from other trees half asleep] Signed-of-by: Dave Airlie commit 368a12117dd8abf6eaefa37c21ac313b517128b9 Author: Tony Breeds Date: Tue Mar 3 17:59:30 2009 +0000 powerpc: Run sbc610 USB fixup code only on the appropriate platform. commit a969e76a7101bf5f3d369563df1ca1253dd6131b (powerpc: Correct USB support for GE Fanuc SBC610) introduced a fixup for NEC usb controllers. This fixup should only run on GEF SBC610 boards. Fixes Fedora bug #486511. (https://bugzilla.redhat.com/show_bug.cgi?id=486511) Signed-off-by: Tony Breeds Signed-off-by: Benjamin Herrenschmidt