From: Tony Lindgren <tony@atomide.com>
Date: Wed, 5 Sep 2012 17:06:08 +0000 (-0700)
Subject: Merge branch 'fixes-wakeupgen' into fixes
X-Git-Tag: firefly_0821_release~3680^2~2102^2~1^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=580a7ce8fb5012c0c0afe592bdafd482a3679911;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes-wakeupgen' into fixes
---

580a7ce8fb5012c0c0afe592bdafd482a3679911