Merge lp:~broder/ubuntu/maverick/initramfs-tools/fix-565047 into lp:ubuntu/maverick/initramfs-tools

[Evan Broder]

[Stéphane Graber (stgraber)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-10-04 22:36:07 +0000
+++ debian/changelog	2011-06-08 16:53:23 +0000
@@ -1,3 +1,10 @@
+initramfs-tools (0.98.1ubuntu6.1) maverick-proposed; 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 <[e-mail]>  Wed, 08 Jun 2011 09:49:46 -0700
+
 initramfs-tools (0.98.1ubuntu6) maverick; urgency=low
 
   * Apparently the iscan hook is sometimes called iscan-data, so ignore
 
=== modified file 'hook-functions'
--- hook-functions	2010-08-18 12:04:34 +0000
+++ hook-functions	2011-06-08 16:53:23 +0000
@@ -400,7 +400,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-microsoft \
 		hid-a4tech hid-belkin hid-bright hid-cherry hid-chicony \
 		hid-cypress hid-dell hid-ezkey hid-gyration hid-logitech \