From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 21 Dec 2011 03:32:17 +0000 (+1100)
Subject: Merge remote-tracking branch 'osd/linux-next'
X-Git-Tag: next-20111221~35
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f5acf09dd82f1fe0887cdab44c8793dbe5fb35aa;p=karo-tx-linux.git

Merge remote-tracking branch 'osd/linux-next'
---

f5acf09dd82f1fe0887cdab44c8793dbe5fb35aa