diff options
| author | David S. Miller <davem@davemloft.net> | 2017-11-10 02:00:18 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-11-10 02:00:18 +0100 |
| commit | 4dc6758d7824a6d25717ccceefc488cafdb07210 (patch) | |
| tree | 992e5d5996910af35a5c12fe94da14d0bb167452 /drivers/isdn/gigaset/common.c | |
| parent | Merge branch 'dsa-setup-stage' (diff) | |
| parent | Merge tag 'pm-final-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ra... (diff) | |
| download | linux-4dc6758d7824a6d25717ccceefc488cafdb07210.tar.xz linux-4dc6758d7824a6d25717ccceefc488cafdb07210.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Simple cases of overlapping changes in the packet scheduler.
Must easier to resolve this time.
Which probably means that I screwed it up somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn/gigaset/common.c')
0 files changed, 0 insertions, 0 deletions