Merge branch 'devel-fixes' into for-next
authorTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 02:26:58 +0000 (18:26 -0800)
committerTony Lindgren <tony@atomide.com>
Tue, 1 Mar 2011 02:26:58 +0000 (18:26 -0800)
Conflicts:
arch/arm/mach-omap2/timer-gp.c


Trivial merge