diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:45:09 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 16:45:09 +0400 |
| commit | afa3a13da7c18f08b9c636fc25a67d40144c5e9b (patch) | |
| tree | 3137c7f2eb9add7d1d2ec6456f6f5cf16d5beeae /arch/arm/mach-shmobile/include/mach/common.h | |
| parent | f12d9f9c9b875aec513ffe31623e46deb862b63c (diff) | |
| parent | 446ee9b2d813a9378e304008fc433ce543ca68a1 (diff) | |
| download | linux-afa3a13da7c18f08b9c636fc25a67d40144c5e9b.tar.xz | |
Merge tag 'renesas-boards-bockw-for-v3.10' of git://git.kernel.org/pub/scm/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>
Diffstat (limited to 'arch/arm/mach-shmobile/include/mach/common.h')
0 files changed, 0 insertions, 0 deletions