summaryrefslogtreecommitdiff
path: root/drivers/nfc
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-25 03:59:22 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-25 03:59:22 +0400
commit3c701651c8c5f35e846512070cdbf2f5980db62c (patch)
tree529271b31a849062491afce37527cb41dab65746 /drivers/nfc
parentf6723b569a67aa4042b4ddc72822bf7f4395f3d2 (diff)
parentcfbf8d4857c26a8a307fb7cd258074c9dcd8c691 (diff)
downloadlinux-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