diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:56:17 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-29 11:56:17 -0400 |
| commit | 6ed962a208cb72cff29a107d6c73247526017ddb (patch) | |
| tree | 2bd574d8ab1db79b369735ba0519a66760019189 /arch/xtensa | |
| parent | c6a389f123b9f68d605bb7e0f9b32ec1e3e14132 (diff) | |
| parent | 55a46269ccedec140e2487a2344e8a247d48b385 (diff) | |
Merge 3.1-rc4 into usb-next
This was done to resolve a conflict in this file:
drivers/usb/host/xhci-ring.c
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/xtensa')
0 files changed, 0 insertions, 0 deletions