From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 30 Nov 2011 00:01:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging.current/staging-linus'
X-Git-Tag: next-20111130~92
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=dbc98f097a06ae86c7c3a32d111aa93f6fb7769f;p=karo-tx-linux.git

Merge remote-tracking branch 'staging.current/staging-linus'
---

dbc98f097a06ae86c7c3a32d111aa93f6fb7769f