| commit | 8a1629c771b1a60bc6d73394d869fe69b13200dc | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Tue May 10 13:30:45 2011 -0700 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Tue May 10 13:30:45 2011 -0700 |
| tree | 12f68138d95b70d450ab418fdfb300ebdcd2f003 | |
| parent | 04aebcbb1b6dccadc8862b2765265f65a946db57 [diff] | |
| parent | 693d92a1bbc9e42681c42ed190bd42b636ca876f [diff] |
Merge branch 2.6.39-rc7 into usb-linus This was needed to resolve a conflict in: drivers/usb/host/isp1760-hcd.c Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>