diff options
| author | Olof Johansson <olof@lixom.net> | 2014-07-07 22:08:30 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-07-07 22:08:30 -0700 |
| commit | bdd18e8f76e33151a850906c8353222bd06a49e6 (patch) | |
| tree | 2a2d0e77d8d4409bcc0e137c1ec8cc1e3be08a98 /drivers/net/ethernet/mellanox/mlx4/main.c | |
| parent | 4c834452aad01531db949414f94f817a86348d59 (diff) | |
| parent | 5f65c5bd58bf027eb2bacc2294a98e7aea81c630 (diff) | |
Merge tag 'renesas-boards-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Renesas ARM Based SoC Boards Updates for v3.17" from Simon Horman:
- armadillo800eva LED support
- Remove now unnecessary work arounds for c\lock issues
- Enable R-Car Gen2 CMA code
* tag 'renesas-boards-for-v3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Enable R-Car Gen2 CMA code in board files
ARM: shmobile: armadillo800eva reference: Spelling s/ED/LED/
ARM: shmobile: armadillo800eva legacy: Add LED support
ARM: shmobile: lager-reference: Remove workarounds for core clock issues
ARM: shmobile: koelsch-reference: Remove workarounds for core clock issues
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/main.c')
0 files changed, 0 insertions, 0 deletions