From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 21 Oct 2011 14:41:07 +0000 (+0200)
Subject: Merge branch 'next/pm' into for-next
X-Git-Tag: next-20111025~110^2~12
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=9b3ace973e4e054643955bfc4749b7fd50aaf67e;p=karo-tx-linux.git

Merge branch 'next/pm' into for-next
---

9b3ace973e4e054643955bfc4749b7fd50aaf67e