From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 7 Jun 2013 01:00:11 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging.current/staging-linus'
X-Git-Tag: next-20130607~114
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5b6ffa95fc61ed5a5265abc87d3f4cf03ee73660;p=karo-tx-linux.git

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

5b6ffa95fc61ed5a5265abc87d3f4cf03ee73660