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

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

e48eca7f2c0cdc6d07f37225d45acb7f89d89ae2