From: Tomi Valkeinen <tomi.valkeinen@ti.com>
Date: Fri, 26 Apr 2013 06:14:47 +0000 (+0300)
Subject: Merge branch '3.10/fb-mmap' into for-next
X-Git-Tag: omap-for-v3.10/dt-fixes-for-merge-window~142^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd;p=pandora-kernel.git

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

Merge topic branch to get vm_iomap_memory into use.

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

9bf9d47a29afbf7a43eae74a988a4aefe88ccbfd
Reading git-diff-tree failed