summaryrefslogtreecommitdiff
path: root/drivers/ssb
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-13 23:10:01 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-02-13 23:10:12 (GMT)
commit50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1 (patch)
tree1785659e73faee5968c2f4fb1a1a18bb77c22ca3 /drivers/ssb
parent5ee71cf3bef66ad9683c681e48628fae057f8e18 (diff)
parentb7bc5925a9aafae970c3db1f118c97a7d503114e (diff)
downloadlinux-fsl-qoriq-50e5dfb6c4111c860bfa4d93dfe115bedf6b0fb1.tar.xz
Merge branch 'usb-linus' into usb-next
This is needed so that Sarah can queue up some xhci changes for 3.4 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/ssb')
0 files changed, 0 insertions, 0 deletions