Fix ACPI vs proc_create_data() mismerge
treef01544d73a8f8e9c425b6b2ef6e851ae54658680
-rw-r--r-- 659 .gitignore
-rw-r--r-- 3696 .mailmap
-rw-r--r-- 18693 COPYING
-rw-r--r-- 92692 CREDITS
drwxr-xr-x - Documentation
-rw-r--r-- 2421 Kbuild
-rw-r--r-- 99120 MAINTAINERS
-rw-r--r-- 54951 Makefile
-rw-r--r-- 16930 README
-rw-r--r-- 3172 REPORTING-BUGS
drwxr-xr-x - arch
drwxr-xr-x - block
drwxr-xr-x - crypto
drwxr-xr-x - drivers
drwxr-xr-x - fs
drwxr-xr-x - include
drwxr-xr-x - init
drwxr-xr-x - ipc
drwxr-xr-x - kernel
drwxr-xr-x - lib
drwxr-xr-x - mm
drwxr-xr-x - net
drwxr-xr-x - samples
drwxr-xr-x - scripts
drwxr-xr-x - security
drwxr-xr-x - sound
drwxr-xr-x - usr
drwxr-xr-x - virt