diff -Nru initramfs-tools-0.98.8ubuntu3/debian/changelog initramfs-tools-0.98.8ubuntu4/debian/changelog
--- initramfs-tools-0.98.8ubuntu3/debian/changelog	2011-06-22 10:59:08.000000000 -0700
+++ initramfs-tools-0.98.8ubuntu4/debian/changelog	2011-06-22 10:57:43.000000000 -0700
@@ -1,3 +1,10 @@
+initramfs-tools (0.98.8ubuntu4) oneiric; urgency=low
+
+  * Rename xhci to xhci-hcd to fix booting from USB 3.0 devices
+    (cherry-picked fix from Debian bug #625224). (LP: #565047)
+
+ -- Evan Broder <evan@ebroder.net>  Wed, 22 Jun 2011 10:57:43 -0700
+
 initramfs-tools (0.98.8ubuntu3) natty; urgency=low
 
   * If copy_exec finds libraries to copy which are only accessible to the
diff -Nru initramfs-tools-0.98.8ubuntu3/hook-functions initramfs-tools-0.98.8ubuntu4/hook-functions
--- initramfs-tools-0.98.8ubuntu3/hook-functions	2011-06-22 10:59:08.000000000 -0700
+++ initramfs-tools-0.98.8ubuntu4/hook-functions	2011-06-22 10:55:24.000000000 -0700
@@ -431,7 +431,7 @@
 {
 	case "${1:-}" in
 	base)
-		for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci hid-apple \
+		for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci-hcd hid-apple \
 		hid-cherry hid-logitech hid-microsoft \
 		hid-a4tech hid-belkin hid-bright hid-chicony \
 		hid-cypress hid-dell hid-ezkey hid-gyration \