From: Olof Johansson <olof@lixom.net>
Date: Tue, 20 Dec 2011 18:06:56 +0000 (-0800)
Subject: Merge branch 'next/devel' into for-next
X-Git-Tag: next-20111221~100^2~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=1b3c4f40f3fd0f1b0865af14b8935e62523a73d1;p=karo-tx-linux.git

Merge branch 'next/devel' into for-next
---

1b3c4f40f3fd0f1b0865af14b8935e62523a73d1