Merge branch 'fixes-for-v3.6-v2' of git://git.infradead.org/users/jcooper/linux into...
authorOlof Johansson <olof@lixom.net>
Sun, 2 Sep 2012 15:21:25 +0000 (08:21 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 2 Sep 2012 15:21:25 +0000 (08:21 -0700)
commit3800bd392ffc70cb699fbd06734ae9aabea97979
treeff5350bb191d24d1247d32d5e8c955fa060672ad
parentaa9f6d6b1be17fb84cd62e19f8d997b378b1c852
parent4fd20570995c46b08711b062c69ab903319d6041
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