summaryrefslogtreecommitdiff
BranchCommit messageAuthorAge
emaclite-cleanupnet: xilinx: emaclite: Remove net_device pointer from struct net_localTobias Klauser7 years
masterMerge tag 'docs-4.10' of git://git.lwn.net/linuxLinus Torvalds7 years
nds-private-removeusbnet: pegasus: Use net_device_stats from struct net_deviceTobias Klauser7 years
packet-loop-backnet: packet: Introduce PACKET_XMIT_RECEIVE socket optionTobias Klauser7 years
packet-rx-pump-backnet: packet: Introduce PACKET_RX_PUMP_BACK socket optionTobias Klauser7 years
 
9dba3b1f85a4abca2a6c93368ae3'>patch) tree7d2f9bb6a538ee8ed5cfa391f2cfa72a3e2daa9f /Documentation parent8d19d7d9dbc25d1a1ffa602ed9eff25a88c98163 (diff)parent66fd7a66e8b9e11e49f46ea77910f935c4dee5c3 (diff)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Git got absolutely destroyed with all our cherry-picking from drm-intel-next-queued to various branches. It ended up inserting intel_crtc_page_flip 2x even in intel_display.c. Backmerge to get back to sanity. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'Documentation')