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)
commitd98820626af5b3e56bc5178fdda7604156f2fa7b
treee9aa235d95516f5ddd666232079358cc80671013
parent4cbe5a555fa58a79b6ecbb6c531b8bab0650778d
parentf0a1f1c226b64859448bfc247dbf8835c4c5cf06
Merge branch 'defconfig' of git://git./linux/kernel/git/horms/renesas into next/defconfig

* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: mach-shmobile: marzen: defconfig update