Merge branch 'omap-fixes' into omap-fixes-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:21:01 +0000 (18:21 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 21 Jan 2010 02:21:01 +0000 (18:21 -0800)
commitb2d959173fea3e04229b2ff33473b5a031669f66
tree3c034551b406c8e8b20deeb0197273e06017c11b
parentccaae273c3f92d7e7acb796d6747077a93dcca4b
parent1daa8c1d75876f690ed8d3f13c806034af5984eb
Merge branch 'omap-fixes' into omap-fixes-for-linus