]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
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)
* '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


Trivial merge