aboutsummaryrefslogtreecommitdiffstats
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-07-27 00:56:39 -0700
committerDavid S. Miller <davem@davemloft.net>2015-07-27 00:56:39 -0700
commit3d3af8859284f982ad62980b3787f05259f1dd10 (patch)
tree633d458001b950f4133afef11e739e1f0bd8d056 /net/dccp/proto.c
parentMerge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth (diff)
parentr8152: don't enable napi before rx ready (diff)
downloadlinux-dev-3d3af8859284f982ad62980b3787f05259f1dd10.tar.xz
linux-dev-3d3af8859284f982ad62980b3787f05259f1dd10.zip
Merge branch 'r8152-fixes'
Hayes Wang says: ==================== r8152: issues fix v2: Replace patch #2 with "r8152: fix wakeup settings". v1: These patches are used to fix issues. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp/proto.c')
0 files changed, 0 insertions, 0 deletions