Merge branch 'linus' into x86/asm, to pick up fixes and resolve conflicts
[linux] / Documentation / backlight /
drwxr-xr-x   ..
-rw-r--r-- 1783 lp855x-driver.txt