This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| firewire | ||
| perf | ||
| power/x86 | ||
| slub | ||
| testing/ktest | ||
| usb | ||
| virtio | ||
This is needed to resolve some merge conflicts that were found in the USB host controller patches, and reported by Stephen Rothwell. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
||
|---|---|---|
| .. | ||
| firewire | ||
| perf | ||
| power/x86 | ||
| slub | ||
| testing/ktest | ||
| usb | ||
| virtio | ||