diff options
| author | Olof Johansson <olof@lixom.net> | 2014-11-08 16:53:48 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-11-08 16:53:48 -0800 |
| commit | b265a6df89ad11d0e726da28c0cf252cedad261f (patch) | |
| tree | 1406eee4fa95f64d7e5f0bc3c2aaddf182ab241d /drivers/pcmcia | |
| parent | f26e29453526fba85e32fffc7e5907eb2a291d47 (diff) | |
| parent | 2667c6adfcf686e8c5a5b56e8c7c65af001df2cb (diff) | |
Merge tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/dt
Merge "at91: dt for 3.19 #1" from Nicolas Ferre:
"Very little DT update for AT91. More will come but I want to send this first
batch soon so it doesn't get in the way of larger modifications."
First DT batch for 3.19:
- CAN device nodes for at91sam9263 and at91sam9x5
- at91sam9x5 DMA definitions for usart
* tag 'at91-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91/dt: at91sam9263: Add CAN device nodes
ARM: at91/dt: at91sam9x5: Add CAN device nodes
ARM: at91/dt/trivial: at91sam9x5_can.dtsi: comment and whitespace fixes
ARM: at91: at91sam9x5 dt: add usart dma definitions to dt
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/pcmcia')
0 files changed, 0 insertions, 0 deletions