Ubuntu

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

Proposed by Evan Broder on 2011-06-08
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~broder/ubuntu/natty/initramfs-tools/fix-565047
Merge into: lp:ubuntu/natty/initramfs-tools
Diff against target: 27 lines (+8/-1) 2 files modified
To merge this branch: bzr merge lp:~broder/ubuntu/natty/initramfs-tools/fix-565047
Reviewer Review Type Date Requested Status
Stéphane Graber 2011-06-08 Approve on 2011-06-22
Review via email: mp+63897@code.launchpad.net
To post a comment you must log in.
review: Approve

Preview Diff

1=== modified file 'debian/changelog'
2--- debian/changelog 2011-03-26 01:15:11 +0000
3+++ debian/changelog 2011-06-08 16:53:24 +0000
4@@ -1,3 +1,10 @@
5+initramfs-tools (0.98.8ubuntu3.1) natty-proposed; urgency=low
6+
7+ * Rename xhci to xhci-hcd to fix booting from USB 3.0 devices
8+ (cherry-picked fix from Debian bug #625224). (LP: #565047)
9+
10+ -- Evan Broder <evan@ebroder.net> Wed, 08 Jun 2011 09:46:20 -0700
11+
12 initramfs-tools (0.98.8ubuntu3) natty; urgency=low
13
14 * If copy_exec finds libraries to copy which are only accessible to the
15
16=== modified file 'hook-functions'
17--- hook-functions 2011-03-26 01:12:17 +0000
18+++ hook-functions 2011-06-08 16:53:24 +0000
19@@ -431,7 +431,7 @@
20 {
21 case "${1:-}" in
22 base)
23- for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci hid-apple \
24+ for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci-hcd hid-apple \
25 hid-cherry hid-logitech hid-microsoft \
26 hid-a4tech hid-belkin hid-bright hid-chicony \
27 hid-cypress hid-dell hid-ezkey hid-gyration \

Subscribers

People subscribed via source and target branches

to all changes: