diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-08-22 01:24:22 +0200 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-08-22 01:24:22 +0200 |
commit | fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b (patch) | |
tree | 5d4aef6d341f84aef6c09a8025004c954fd3f792 /net/llc/llc_conn.c | |
parent | Merge tag 'sunxi-core-for-3.12' of https://github.com/mripard/linux into next... (diff) | |
parent | ARM: sunxi: Introduce Allwinner A20 support (diff) | |
download | linux-fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b.tar.xz linux-fe870ae70bda4bb19ae6920a62e7d05f1dde9b2b.zip |
Merge tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux into next/soc
Allwinner sunXi core additions for 3.12, take 2
These patches add machine support for the Allwinner A20 and A31 SoCs
* tag 'sunxi-core-for-3.12-2' of https://github.com/mripard/linux:
ARM: sunxi: Introduce Allwinner A20 support
ARM: sun6i: Add restart code for the A31
ARM: sunxi: Add the Allwinner A31 compatible to the machine definition
Diffstat (limited to 'net/llc/llc_conn.c')
0 files changed, 0 insertions, 0 deletions