diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 03:59:22 +0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-25 03:59:22 +0400 |
commit | 3c701651c8c5f35e846512070cdbf2f5980db62c (patch) | |
tree | 529271b31a849062491afce37527cb41dab65746 /drivers/nfc | |
parent | f6723b569a67aa4042b4ddc72822bf7f4395f3d2 (diff) | |
parent | cfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff) | |
download | linux-3c701651c8c5f35e846512070cdbf2f5980db62c.tar.xz |
Merge 3.14-rc4 into usb-next
We want the USB fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/nfc')
0 files changed, 0 insertions, 0 deletions