leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
86ff0e508f
linux/drivers/acpi/acpica
History
Lv Zheng 86ff0e508f ACPICA: Fix unmerged acmacros.h divergences. 
The 20121018 release depends on some unmerged acmaros.h fixes.
This patch includes the fixes made on acmaros.h that will not affect
the generated vmlinux binary.

This patch will not affect the generated vmlinux binary.
This will decrease 157 lines of 20120913 divergence.diff.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
2012-11-15 00:31:23 +01:00
..
accommon.h ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
acdebug.h ACPICA: Fix unmerged debugger divergences. 2012-11-15 00:31:22 +01:00
acdispat.h ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
acevents.h ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
acglobal.h ACPICA: Fix AcpiSrc caused divergences. 2012-11-15 00:31:23 +01:00
achware.h ACPICA: GPE support: Remove extraneous parameter from low-level function. 2012-09-21 00:26:17 -04:00
acinterp.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
aclocal.h ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
acmacros.h ACPICA: Fix unmerged acmacros.h divergences. 2012-11-15 00:31:23 +01:00
acnamesp.h ACPICA: Object repair code: Support to add Package wrappers 2012-03-30 01:45:13 -04:00
acobject.h ACPICA: Fix AcpiSrc caused divergences. 2012-11-15 00:31:23 +01:00
acopcode.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acparser.h ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
acpredef.h ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
acresrc.h ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
acstruct.h ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
actables.h ACPICA: Add acpi_os_physical_table_override interface 2012-03-22 01:44:59 -04:00
acutils.h ACPICA: Fix divergences of definition conflicts. 2012-11-15 00:31:22 +01:00
amlcode.h ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
amlresrc.h ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsargs.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dscontrol.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsfield.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsinit.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsmethod.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsmthdat.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsobject.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dsopcode.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
dsutils.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
dswexec.c ACPICA: Fix AcpiSrc caused divergences. 2012-11-15 00:31:23 +01:00
dswload2.c ACPICA: Enable Scope change to root during module-level code execution. 2012-09-21 00:26:16 -04:00
dswload.c ACPICA: Enable Scope change to root during module-level code execution. 2012-09-21 00:26:16 -04:00
dswscope.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
dswstate.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evevent.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evglock.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evgpe.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evgpeblk.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evgpeinit.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
evgpeutil.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evmisc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evregion.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evrgnini.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evsci.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evxface.c ACPICA: Fix AcpiSrc caused divergences. 2012-11-15 00:31:23 +01:00
evxfevnt.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
evxfgpe.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
evxfregn.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exconfig.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exconvrt.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
excreate.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
exdebug.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exdump.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
exfield.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exfldio.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
exmisc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exmutex.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exnames.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
exoparg1.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg2.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg3.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exoparg6.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exprep.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exregion.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exresnte.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exresolv.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exresop.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
exstore.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exstoren.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
exstorob.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exsystem.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
exutils.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
hwacpi.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
hwesleep.c ACPI: delete _GTS/_BFS support 2012-07-30 21:11:25 -04:00
hwgpe.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
hwpci.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
hwregs.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
hwsleep.c ACPI: delete _GTS/_BFS support 2012-07-30 21:11:25 -04:00
hwtimer.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
hwvalid.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
hwxface.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
hwxfsleep.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
Makefile ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
nsaccess.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
nsalloc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsdump.c Cleanup of invalid ACPI name handling and repair 2012-11-15 00:31:21 +01:00
nsdumpdv.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nseval.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsinit.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
nsload.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsnames.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsobject.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsparse.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
nspredef.c Merge branches 'acpi_pad', 'acpica', 'apei-bugzilla-43282', 'battery', 'cpuidle-coupled', 'cpuidle-tweaks', 'intel_idle-ivb', 'ost', 'red-hat-bz-772730', 'thermal', 'thermal-spear' and 'turbostat-v2' into release 2012-07-26 00:03:58 -04:00
nsrepair2.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsrepair.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nssearch.c Cleanup of invalid ACPI name handling and repair 2012-11-15 00:31:21 +01:00
nsutils.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nswalk.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
nsxfeval.c ACPICA: Fix divergences of definition conflicts. 2012-11-15 00:31:22 +01:00
nsxfname.c ACPICA: Fix divergences of definition conflicts. 2012-11-15 00:31:22 +01:00
nsxfobj.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
psargs.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
psloop.c ACPICA: Fix unmerged acmacros.h divergences. 2012-11-15 00:31:23 +01:00
psopcode.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
psparse.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
psscope.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
pstree.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
psutils.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
pswalk.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
psxface.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rsaddr.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rscalc.c ACPICA: Fix indent caused divergences. 2012-11-15 00:31:23 +01:00
rscreate.c ACPICA: Fix some comment fields 2012-07-17 00:05:49 -04:00
rsdump.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rsinfo.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsio.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsirq.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rslist.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rsmemory.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsmisc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rsserial.c ACPICA: Update all copyrights to 2012 2012-01-17 03:38:51 -05:00
rsutils.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
rsxface.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
tbfadt.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
tbfind.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
tbinstal.c ACPICA: Table Manager: Merge duplicate code (root table) 2012-09-21 00:35:12 -04:00
tbutils.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
tbxface.c ACPICA: Table Manager: Merge duplicate code (root table) 2012-09-21 00:35:12 -04:00
tbxfload.c ACPICA: Add new ACPI table load/unload external interfaces 2012-07-17 00:05:50 -04:00
tbxfroot.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utaddress.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utalloc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utcache.c ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
utclib.c ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
utcopy.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utdebug.c ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
utdecode.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utdelete.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
uteval.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utexcep.c ACPICA: Split exception code utilities to a new file, utexcep.c 2012-07-17 00:05:49 -04:00
utglobal.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utids.c ACPICA: Fix divergences of definition conflicts. 2012-11-15 00:31:22 +01:00
utinit.c ACPICA: Support for custom ACPICA build for ACPI 5 reduced hardware 2012-03-22 01:44:49 -04:00
utlock.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utmath.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utmisc.c ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
utmutex.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utobject.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utosi.c ACPICA: Add Windows8/Server2012 string for _OSI method. 2012-09-21 00:26:16 -04:00
utresrc.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utstate.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
uttrack.c ACPICA: Fix unmerged utility divergences. 2012-11-15 00:31:21 +01:00
utxface.c ACPICA: Add support for complex _PLD buffers. 2012-09-21 00:26:17 -04:00
utxferror.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00
utxfinit.c ACPICA: Split ACPICA initialization functions to new file, utxfinit.c 2012-09-21 00:26:16 -04:00
utxfmutex.c ACPICA: AcpiSrc: Fix some translation issues for Linux conversion 2012-07-17 00:05:51 -04:00