From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 17 Nov 2011 01:49:05 +0000 (+1100)
Subject: Merge remote-tracking branch 'osd/linux-next'
X-Git-Tag: next-20111117~20
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0ec6700e8d2034ab577bf8236b2c1d04f9c3e84;p=karo-tx-linux.git

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

c0ec6700e8d2034ab577bf8236b2c1d04f9c3e84