summaryrefslogtreecommitdiff
path: root/include/uapi/video
ModeNameSize
-rw-r--r--Kbuild87logplain
-rw-r--r--edid.h165logplain
-rw-r--r--sisfb.h7594logplain
-rw-r--r--uvesafb.h1030logplain
'oid'>76e0e70e6452b971a69cc9794ff4a6715c11f7f2 (diff)parent926af6273fc683cd98cd0ce7bf0d04a02eed6742 (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 'tools/virtio/asm/barrier.h')