Merge branch 'testing-misc' into dt-merge
authorTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 02:08:47 +0000 (19:08 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 02:08:47 +0000 (19:08 -0700)
Conflicts:
arch/arm/mach-omap2/board-generic.c


Trivial merge