Merge branch 'fixes-non-critical' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/fixes-non-critical

This commit is contained in:
Olof Johansson 2011-12-13 12:10:02 -08:00
commit 74615d8541