]> 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)
commitab406d431582bdc623bb55150b65ff682bb73e70
tree966b838e2190a7d6868cda5f4eee6d0f490da27c
parent990a694e98720c8cb9720dfb14bb6f6a6df1d722
parent433dc3f7d3ee7b7e3da241f04e43b78255756242
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