Merge branch 'fixes-v3.2-rc2' into fixes
authorTony Lindgren <tony@atomide.com>
Wed, 23 Nov 2011 22:46:10 +0000 (14:46 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Nov 2011 22:46:10 +0000 (14:46 -0800)
1  2 
arch/arm/mach-omap2/cpuidle34xx.c

Simple merge