From: Olof Johansson <olof@lixom.net>
Date: Sat, 10 Mar 2012 16:56:58 +0000 (-0800)
Subject: Merge branch 'fixes-non-critical-part3' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: firefly_0821_release~3680^2~3254^2~3
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=74c46469a5f70a29ac961cfaa90a0422f1d09230;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes-non-critical-part3' of git://git./linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

* 'fixes-non-critical-part3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build for omap4 only builds with missing include of linux/bug.h
  ARM: OMAP2+: Fix section warnings for hsmmc_init_one
---

74c46469a5f70a29ac961cfaa90a0422f1d09230