Commit 66b0835e authored 14 years ago by Greg Kroah-Hartman

Merge 2.6.38-rc5 into usb-next


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>

parents 479b46b5 85e2efbb

No related merge requests found

Hide whitespace changes

Inline Side-by-side

Showing with 31 additions and 5 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment