Merge tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux...
authorArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 12:45:09 +0000 (14:45 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 9 Apr 2013 12:45:09 +0000 (14:45 +0200)
commitafa3a13da7c18f08b9c636fc25a67d40144c5e9b
tree3137c7f2eb9add7d1d2ec6456f6f5cf16d5beeae
parentf12d9f9c9b875aec513ffe31623e46deb862b63c
parent446ee9b2d813a9378e304008fc433ce543ca68a1
Merge tag 'renesas-boards-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 board updates for v3.10

Add SMSC ethernet support to the bockw board.

This pull request is based on a merge of:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-soc-r8a7778-for-v3.10
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git renesas-boards3-for-v3.10

The reason for merging with renesas-soc-r8a7778-for-v3.10 is
to provide pre-requisite SoC code to configure IRQ pins for the
SMSC ethernet.

* tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: bockw: enable network settings on bootargs
  ARM: shmobile: bockw: add SMSC ethernet support

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