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)
commit580a7ce8fb5012c0c0afe592bdafd482a3679911
tree3fb6b00359a63d8d2e33005599046c105956d314
parenta17fb8f520c3c662686aa54a86773f354002c7d3
parente534e871a94ba2e3bfdf0edd3685eb805fc960d8
Merge branch 'fixes-wakeupgen' into fixes
arch/arm/mach-omap2/Kconfig