From: Jiri Kosina <jkosina@suse.cz>
Date: Mon, 1 Oct 2012 08:10:10 +0000 (+0200)
Subject: Merge branch 'upstream' into for-next
X-Git-Tag: next-20121002~74^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d4ff5fd2600395eb035f2daa442e57c395cca809;p=karo-tx-linux.git

Merge branch 'upstream' into for-next
---

d4ff5fd2600395eb035f2daa442e57c395cca809