From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 30 Oct 2012 02:12:31 +0000 (+1100)
Subject: Merge remote-tracking branch 'osd/linux-next'
X-Git-Tag: next-20121030~44
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=48425f878744069f0516d68bb499f015cd87b94b;p=karo-tx-linux.git

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

48425f878744069f0516d68bb499f015cd87b94b