summaryrefslogtreecommitdiff
path: root/include/drm/drm_crtc_helper.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-02-05 15:10:58 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-05 15:10:58 -0800
commitd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c (patch)
tree8b8b91485883c0ceca10625ec5d6ef8443776604 /include/drm/drm_crtc_helper.h
parenta572a1b999489efb591287632279c6c9eca3e4ed (diff)
Linux 4.10-rc7
Diffstat (limited to 'include/drm/drm_crtc_helper.h')
0 files changed, 0 insertions, 0 deletions
it/commit/sound/soc/codecs/max9877.h?h=nds-private-remove&id=926af6273fc683cd98cd0ce7bf0d04a02eed6742'>926af6273fc683cd98cd0ce7bf0d04a02eed6742 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The conflict was an interaction between a bug fix in the netvsc driver in 'net' and an optimization of the RX path in 'net-next'. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'sound/soc/codecs/max9877.h')