Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renes...
authorOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:15:54 +0000 (06:15 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 6 Nov 2012 14:15:54 +0000 (06:15 -0800)
commita46052c1941fd5ac1d8a73f1be32283493f21562
treec91fd17c85c91deb707375129956538d3be2b91d
parent94058fc593c7d309af112d3124ae0fbb6880d8ec
parent67e13cbb807c6b95706e4ec0ca2c068f14f25588
Merge branch 'defconfig' of git://git./linux/kernel/git/horms/renesas into next/boards

From Simon Horman:

"I will work on the suggestions by Arnd to reduce the number
of defconfigs for shmobile - in essence moving towards one or
two generic configs rather than per-board configs. However,
this seems to be somewhat non-trivial and in the mean time
I would like to keep updating the existing defcoings."

* 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: leave CONFIG_INOTIFY_USER enabled by default
  ARM: shmobile: armadillo800eva: enable L2X0 cache on defconfig
  ARM: shmobile: mackerel: defconfig update
arch/arm/configs/kzm9g_defconfig