Merge branch 'fixes-wakeupgen' into fixes
authorTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 00:23:06 +0000 (17:23 -0700)
committerTony Lindgren <tony@atomide.com>
Wed, 5 Sep 2012 00:23:06 +0000 (17:23 -0700)

Trivial merge