diff options
| author | Olof Johansson <olof@lixom.net> | 2013-08-29 14:07:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-08-29 14:07:34 -0700 |
| commit | 6f244c9ccf22bc38d2ce39b1c7ee304dab7e5328 (patch) | |
| tree | 633d36d251f645c23feb0dc981f2e0ab7ab7e7bb /drivers/net/nlmon.c | |
| parent | ef2fd3b15bd2da46e13cc61d475286e5e6026211 (diff) | |
| parent | 746831d5a166b1965034318ab80a7a7af03bf30f (diff) | |
| download | linux-6f244c9ccf22bc38d2ce39b1c7ee304dab7e5328.tar.gz linux-6f244c9ccf22bc38d2ce39b1c7ee304dab7e5328.tar.bz2 linux-6f244c9ccf22bc38d2ce39b1c7ee304dab7e5328.zip | |
Merge tag 'at91-soc' of git://github.com/at91linux/linux-at91 into late/all
From Nicolas Ferre:
AT91 SoC update for 3.12 take 1
- enable kernel uncompress information output for
SoC where it was missing: at91sam9n12 and sama5d3
- addition of at91rm9200 to the generic at91_dt_defconfig
* tag 'at91-soc' of git://github.com/at91linux/linux-at91:
ARM: at91: at91_dt_defconfig: enable rm9200 support
ARM: at91: sam9n12: enable kernel uncompress info output
ARM: at91: sama5: enable kernel uncompress info output
ARM: at91: include sama5d3.h into hardware.h
ARM: at91: sama5d3: add definition for usart base address
Diffstat (limited to 'drivers/net/nlmon.c')
0 files changed, 0 insertions, 0 deletions