diff options
author | 2011-12-16 14:51:24 -0800 | |
---|---|---|
committer | 2011-12-16 14:51:24 -0800 | |
commit | 578bd83d7e2bbf533c6968291abb36850c6eaff8 (patch) | |
tree | ed9643d02f34d28036f4fc07d2211ad0b91219cb /crypto/api.c | |
parent | Merge branch 'omap/musb' into next/boards (diff) | |
parent | Merge branch 'imx6/boards' of git://git.linaro.org/people/shawnguo/linux-2.6 into imx6/boards (diff) | |
download | wireguard-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.tar.xz wireguard-linux-578bd83d7e2bbf533c6968291abb36850c6eaff8.zip |
Merge branch 'imx6/boards' into next/boards
* imx6/boards:
ARM: imx6q: generate imx6q dtb files
arm/imx6q: Rename Sabreauto to Armadillo2
arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
arm/imx6: add imx6q sabrelite board support
dts/imx: rename uart labels to consistent with hw spec
dts/imx: rename gpio labels to consistent with hw spec
Diffstat (limited to 'crypto/api.c')
0 files changed, 0 insertions, 0 deletions