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

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

1faafe8d4eb6e5b27e15d09e2a78f1cd58c65c90