Merge branch 'fixes-non-critical-part3' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Sat, 10 Mar 2012 16:56:58 +0000 (08:56 -0800)
committerOlof Johansson <olof@lixom.net>
Sat, 10 Mar 2012 16:56:58 +0000 (08:56 -0800)
* '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


Trivial merge