From: Jiri Kosina <jkosina@suse.cz>
Date: Sat, 23 Oct 2010 20:44:36 +0000 (+0200)
Subject: Merge branches 'upstream' and 'upstream-fixes' into for-linus
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c3d9d74336c10c133ed062a1d778d457c6a46422;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

Merge branches 'upstream' and 'upstream-fixes' into for-linus
---

c3d9d74336c10c133ed062a1d778d457c6a46422