From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Wed, 22 Feb 2012 21:38:43 +0000 (+0100)
Subject: Merge branch 'master' into for-next
X-Git-Tag: next-20120402~39^2~3
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=02c68b739bc9d65a697cb11d1276b3c475d3ff2a;p=karo-tx-linux.git

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

02c68b739bc9d65a697cb11d1276b3c475d3ff2a