From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 10 Aug 2010 11:22:08 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: firefly_0821_release~7613^2~3662^2~38
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb8231a8b139035476f2a8aaac837d0099b66dad;p=firefly-linux-kernel-4.4.55.git

Merge branch 'master' into for-next

Conflicts:
	arch/arm/mach-omap1/board-nokia770.c
---

fb8231a8b139035476f2a8aaac837d0099b66dad