From: Olof Johansson Date: Tue, 6 Nov 2012 14:15:54 +0000 (-0800) Subject: Merge branch 'defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renes... X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~48^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a46052c1941fd5ac1d8a73f1be32283493f21562;p=pandora-kernel.git 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 --- a46052c1941fd5ac1d8a73f1be32283493f21562 Reading git-diff-tree failed