From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 3 Aug 2011 01:12:34 +0000 (+1000)
Subject: Merge remote-tracking branch 'staging.current/staging-linus'
X-Git-Tag: next-20110803~69
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bcf5d2757d64344900cd41492fbe1f21a3d9696b;p=karo-tx-linux.git

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

bcf5d2757d64344900cd41492fbe1f21a3d9696b