Merge tag 'renesas-defconfig-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:31:37 +0000 (20:31 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 8 Apr 2013 18:31:37 +0000 (20:31 +0200)
commitf12d9f9c9b875aec513ffe31623e46deb862b63c
tree92cc49c772ec2494b46dd15d4aca2accfc23a6c8
parent16eaaee4d87b2255797f94341bd442f1f93afd1b
parente2f77f6ff54865870870aaff0c07e2c35c4e0cfa
Merge tag 'renesas-defconfig-bockw-for-v3.10' of git://git./linux/kernel/git/horms/renesas into next/boards2

From Simon Horman <horms+renesas@verge.net.au>:

Renesas ARM based SoC bockw defconfig updates for v3.10

An update to the defconfig for the bockw board to enable SMSC ethernet.

This is based on:

git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas renesas-boards3-for-v3.10

The reason for using that base is that the bockw defconfig was added
in the boards branch instead of the defconfig branch, which was not ideal.

* tag 'renesas-defconfig-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: bockw: enable SMSC ethernet on defconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>