summaryrefslogtreecommitdiffstats
path: root/Documentation/hid
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-10-23 22:28:39 +0200
committerDavid S. Miller <davem@davemloft.net>2013-10-23 22:49:34 +0200
commitc3fa32b9764dc45dcf8a2231b1c110abc4a63e0b (patch)
tree6cf2896a77b65bec64284681e1c3851eb3263e09 /Documentation/hid
parentnet: always inline net_secret_init (diff)
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39... (diff)
downloadlinux-c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b.tar.xz
linux-c3fa32b9764dc45dcf8a2231b1c110abc4a63e0b.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts: drivers/net/usb/qmi_wwan.c include/net/dst.h Trivial merge conflicts, both were overlapping changes. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/hid')
0 files changed, 0 insertions, 0 deletions