diff options
author | Dave Airlie | 2018-03-28 06:30:41 +0200 |
---|---|---|
committer | Dave Airlie | 2018-03-28 06:30:41 +0200 |
commit | 2b4f44eec2be2688511c2b617d0e1b4f94c45ba4 (patch) | |
tree | 533c03602f4ae6d6404db6fa56c88e6f83e1bebe /drivers/net/team/team_mode_activebackup.c | |
parent | Merge branch 'drm-next-4.17' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
parent | Linux 4.16-rc7 (diff) | |
download | kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.gz kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.tar.xz kernel-qcow2-linux-2b4f44eec2be2688511c2b617d0e1b4f94c45ba4.zip |
Backmerge tag 'v4.16-rc7' into drm-next
Linux 4.16-rc7
This was requested by Daniel, and things were getting
a bit hard to reconcile, most of the conflicts were
trivial though.
Diffstat (limited to 'drivers/net/team/team_mode_activebackup.c')
0 files changed, 0 insertions, 0 deletions