From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Thu, 29 May 2014 17:02:36 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: next-20140530~77^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=165d560bb267db05b63e650c2cebc43c501b44c4;p=karo-tx-linux.git

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

165d560bb267db05b63e650c2cebc43c501b44c4