Merge tag 'v4.9-rc1' into x86/fpu, to resolve conflict
[linux-2.6-block.git] / Documentation / devicetree / bindings / arm / hisilicon /
drwxr-xr-x   ..
-rw-r--r-- 371 hi3519-sysctrl.txt
-rw-r--r-- 7562 hisilicon.txt