Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renes...

Merge branch 'defconfig' of git://git.kernel.org/pub/scm/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