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)
commit52f3a41e0aca5625fbd118ed57a4debb25817e99
tree86730c862fc97eef5f1eb1a81bf74bf2a8a36754
parente9b7086b80c4d9e354f4edc9e280ae85a60df408
parent8770b07c2dff3cec2c751b289ee690137c88ea54
Merge branch 'fixes-v3.2-rc2' into fixes
arch/arm/mach-omap2/cpuidle34xx.c