]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch '3.10/fb-mmap' into for-next
authorTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 26 Apr 2013 06:14:47 +0000 (09:14 +0300)
committerTomi Valkeinen <tomi.valkeinen@ti.com>
Fri, 26 Apr 2013 06:14:47 +0000 (09:14 +0300)
commit626b7c3713fbea85c95063f83d62079cc3cd4399
tree966b838e2190a7d6868cda5f4eee6d0f490da27c
parenteee4a500c5b2b8b61eedae29966c3f5283b7cc4f
parent0c9b4085a2c7dd3f76f6483eb3f33b281c75067a
Merge branch '3.10/fb-mmap' into for-next

Merge topic branch to get vm_iomap_memory into use.

Conflicts:
drivers/video/fbmon.c
drivers/video/fbmon.c