diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:44:07 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 14:44:07 +0200 |
| commit | 9df00f634a44a0191dcf992a944527a220a5baad (patch) | |
| tree | 3937e6dd237dd9c420d1d11d048a28286db40cc7 /net/unix/af_unix.c | |
| parent | 2fce7e1106dd6dcbe3c72cec2ea81b452a50de6e (diff) | |
| parent | 524219146a89aee5366326c225ccd71231419d89 (diff) | |
| download | lwn-9df00f634a44a0191dcf992a944527a220a5baad.tar.gz lwn-9df00f634a44a0191dcf992a944527a220a5baad.zip | |
Merge tag 'renesas-soc-r8a7778-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc2
From Simon Horman <horms+renesas@verge.net.au>:
Renesas ARM r8a7778 SoC update for v3.10
Update to the r8a7778 SoC:
* Add SH Ethernet support
* Add r8a7778_init_irq_extpin() to allow configuration of IRQ0 - IRQ3
- This is a requirement for SMSC ethernet support
* Cleanup: remove PLATFORM_INFO macro
This pull request is based on:
git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas renesas-soc2-for-v3.10
* tag 'renesas-soc-r8a7778-for-v3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: R8A7778: add Ether support
ARM: shmobile: r8a7778: add r8a7778_init_irq_extpin()
ARM: shmobile: r8a7778: remove pointless PLATFORM_INFO()
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'net/unix/af_unix.c')
0 files changed, 0 insertions, 0 deletions