Skip to content
Commit 9bf9d47a authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

Merge branch '3.10/fb-mmap' into for-next 

Merge topic branch to get vm_iomap_memory into use.

Conflicts:
	drivers/video/fbmon.c
parents e45f265e 138f296e
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment