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)
commit74c46469a5f70a29ac961cfaa90a0422f1d09230
treee8f5131335e5743c8a463540155ad73e9784f2af
parentd9a5f4dd437ceb007e1f118e90ba5587a5e04d20
parent4647ca5761f5534470e98d06494403a2fd0d7b32
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