From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Sep 2012 00:48:23 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging.current/staging-linus'
X-Git-Tag: next-20120907~116
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bbe85f29e6c8ea4609cea94917aa4186426c7665;p=karo-tx-linux.git

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

bbe85f29e6c8ea4609cea94917aa4186426c7665