From: Jiri Kosina <jkosina@suse.cz>
Date: Tue, 28 May 2013 10:01:07 +0000 (+0200)
Subject: Merge branch 'master' into for-next
X-Git-Tag: v3.11-rc1~89^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377;p=users%2Fdwmw2%2Flinux.git

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

6e9041c6ddd6cbdc61d87bcaca8ca7bb17c28377