From: Olof Johansson <olof@lixom.net>
Date: Sun, 2 Sep 2012 15:21:25 +0000 (-0700)
Subject: Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into... 
X-Git-Tag: v3.6-rc5~6^2~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3800bd392ffc70cb699fbd06734ae9aabea97979;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into fixes

* 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: Fix 'SZ_1M' undeclared here for db88f6281-bp-setup.c
---

3800bd392ffc70cb699fbd06734ae9aabea97979