summaryrefslogtreecommitdiffstats
path: root/drivers/usb/Makefile
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-25 09:11:02 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-25 09:12:22 -0700
commit8f8741ca5e55a35dafa35f4eac2b70b08fae997e (patch)
tree4f3d0d5f685a735d5d6265c1b3cafda71ff0683e /drivers/usb/Makefile
parent0a6a2daf1c7a30c3ca66a8ddb8fc4ff7820051e2 (diff)
parent6b16351acbd415e66ba16bf7d473ece1574cf0bc (diff)
Merge 3.5-rc4 into usb-linus
This is needed to sync up with the previous USB changes that were merged in Linus's branch. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/Makefile')
0 files changed, 0 insertions, 0 deletions