diff options
| author |   Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:42:09 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2012-11-20 23:42:09 +0100 |
| commit | 74f980beaa660614c707675ce6a11e70db3d49b6 (patch) | |
| tree | 1850743db35687b9015d775c8fd494e60dee86fc /include/linux/platform_data/serial-sccnxp.h | |
| parent | Merge tag 'marvell-xor-board-dt-changes-3.8-v2' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge (diff) | |
| parent | arm: mvebu: update defconfig to include XOR driver (diff) | |
| download | linux-rng-74f980beaa660614c707675ce6a11e70db3d49b6.tar.xz linux-rng-74f980beaa660614c707675ce6a11e70db3d49b6.zip | |
Merge tag 'marvell-net-xor-defconfig-for-3.8' of github.com:MISL-EBU-System-SW/mainline-public into test-the-merge
Marvell mvebu defconfig updates for 3.8
Conflicts:
arch/arm/configs/mvebu_defconfig
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'include/linux/platform_data/serial-sccnxp.h')
0 files changed, 0 insertions, 0 deletions