summaryrefslogtreecommitdiffstats
path: root/drivers/memstick
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-08-21 11:44:04 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-21 11:44:04 -0700
commitdc25b25897289bad4907f30151ffe5baf75ff369 (patch)
treec99301de2cdf66d7af48fc43b6161bda6faaae70 /drivers/memstick
parent1a69205c471221a7f9101df164642611e37c52e4 (diff)
parent0bad90985d39e69ca035fdd70bcc743812641d18 (diff)
downloadlinux-dc25b25897289bad4907f30151ffe5baf75ff369.tar.gz
linux-dc25b25897289bad4907f30151ffe5baf75ff369.tar.bz2
linux-dc25b25897289bad4907f30151ffe5baf75ff369.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/usb/qmi_wwan.c Overlapping additions of new device IDs to qmi_wwan.c Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/memstick')
0 files changed, 0 insertions, 0 deletions