From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 10 Mar 2012 16:42:19 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: next-20120402~39^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6f6f92d4da39725efeb7a6e92616df4d2068f6f9;p=karo-tx-linux.git

Merge branch 'master' into for-next
---

6f6f92d4da39725efeb7a6e92616df4d2068f6f9