Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renes...
authorOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:50:40 +0000 (14:50 -0700)
committerOlof Johansson <olof@lixom.net>
Fri, 7 Sep 2012 21:50:40 +0000 (14:50 -0700)
* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: marzen: defconfig update


Trivial merge