From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 2 Dec 2011 01:30:48 +0000 (+1100)
Subject: Merge remote-tracking branch 'pm/linux-next'
X-Git-Tag: next-20111202~25
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=652aa68f0b4558bed726bf04f29b65674e9da056;p=karo-tx-linux.git

Merge remote-tracking branch 'pm/linux-next'
---

652aa68f0b4558bed726bf04f29b65674e9da056