summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-12-17 22:55:29 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2015-12-17 22:55:29 +0300
commitce42af94aadcae7d713227bd3b3dbcc76e96db11 (patch)
tree96974843ecfa1cde54442b38beaa5779b2176e23 /drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
parentb4b29f94856ad68329132c2306e9a114920643e3 (diff)
parent4655a12b81edab7cc7b13ca4db4094792fb01b4a (diff)
downloadlinux-ce42af94aadcae7d713227bd3b3dbcc76e96db11.tar.xz
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "Some i915 fixes, one omap fix, one core regression fix. Not even enough fixes for a twelve days of xmas song, which seemms good" * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: drm: Don't overwrite UNVERFIED mode status to OK drm/omap: fix fbdev pix format to support all platforms drm/i915: Do a better job at disabling primary plane in the noatomic case. drm/i915/skl: Double RC6 WRL always on drm/i915/skl: Disable coarse power gating up until F0 drm/i915: Remove incorrect warning in context cleanup
Diffstat (limited to 'drivers/net/ethernet/stmicro/stmmac/stmmac_main.c')
0 files changed, 0 insertions, 0 deletions