| commit | 02d5f0857bc2962625fa2d34957d43a9e3175eb4 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Mar 28 11:00:55 2013 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Thu Mar 28 11:00:55 2013 -0700 |
| tree | 1146b3a025f8257a99b9a02eb62a4e338bb6ec01 | |
| parent | 659597b77493959c699b4e99841a2c778eaa70bc [diff] | |
| parent | 482b0b5d82bd916cc0c55a2abf65bdc69023b843 [diff] |
Merge branch 'usb-linus' into usb-next This lets us fix the build error that happens when these two trees are merged together. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>