diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-18 15:55:56 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-06-18 15:55:56 +1000 |
| commit | 1579db6df9eda5b8908a0a7319abb832ef7a9f37 (patch) | |
| tree | 4a18bed59e9a7fffc5fd363416ae56840c2a0d4b /include/linux/configfs.h | |
| parent | 1ac0cb1fde5f7f66499a465b165d7465363b897e (diff) | |
| parent | bc3e452003d02b8ec21546490aaed36003a83864 (diff) | |
Merge remote-tracking branch 'init/init-v4.1-rc6'
Conflicts:
arch/arm/mach-hisi/headsmp.S
arch/arm/mach-keystone/platsmp.c
Diffstat (limited to 'include/linux/configfs.h')
0 files changed, 0 insertions, 0 deletions