diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-05-19 12:31:35 +0300 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-05-19 12:31:35 +0300 |
commit | 5632a9fbcd451892332d45553ce8b831d5143691 (patch) | |
tree | d02ff0e4b7045449e8c6cb1c0af7233bd39bff8f /arch/arm/kernel/setup.c | |
parent | a41980f2a3eb33ed7a2636e83498b47e95ceb05b (diff) | |
parent | e31db4c756879bcd653ff4f36ee3f179c5e333bf (diff) | |
parent | 07a7056ccce3ffdb65908bf502aeb2503714da46 (diff) | |
parent | 6427a840ff6aeaac36c59872b0b4b2040ed26c9b (diff) | |
download | linux-5632a9fbcd451892332d45553ce8b831d5143691.tar.xz |
Merge branches 'amba', 'devel-stable', 'kexec-for-next' and 'misc' into for-linus