aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorGraeme Gregory <graeme.gregory@linaro.org>2013-10-23 14:01:24 +0100
committerGraeme Gregory <graeme.gregory@linaro.org>2013-10-23 14:01:24 +0100
commit1857c8849bf548ba9c696a2b6d8188eb7ae753e2 (patch)
tree362a5e7a7a612a579e92032304f7082f3cbd1808 /drivers/net
parent9ef057516f4fe79ad416bd473bddfe8ecc9ca4f6 (diff)
parentfc976ae0704a67ea6853fac18a4ecd584bf0cc0a (diff)
Merge branch 'armv8-uefi-latest' of https://github.com/mosalter/linux into leg-kernel
Conflicts: arch/arm/Kconfig include/linux/efi.h
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions