From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 1 Dec 2011 23:27:55 +0000 (+1100)
Subject: Merge remote-tracking branch 'staging.current/staging-linus'
X-Git-Tag: next-20111202~92
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5362bc841f4ab04b1da7daae40a191fc5488ca81;p=karo-tx-linux.git

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

5362bc841f4ab04b1da7daae40a191fc5488ca81