summaryrefslogtreecommitdiffstats
path: root/drivers/tc/tc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 16:07:37 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-12-09 16:07:48 -0800
commita36ae95c4e220afb976dd9d0d813d01e882b7b59 (patch)
tree5a128e3f6a5a0d29c9dfd81a116381452951318f /drivers/tc/tc.c
parentb870defebde40d01d951c9affd86c59841757c31 (diff)
parent5611cc4572e889b62a7b4c72a413536bf6a9c416 (diff)
Merge v3.2-rc4 into usb-next
This lets us handle the PS3 merge easier, as well as syncing up with other USB fixes already in the -rc4 tree. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tc/tc.c')
0 files changed, 0 insertions, 0 deletions