Merge branch 'fixes-wakeupgen' into fixes
authorTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 17:06:08 +0000 (10:06 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 17:06:08 +0000 (10:06 -0700)
1  2 
arch/arm/mach-omap2/Kconfig

Simple merge