FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 05:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
ce47f52f42
linux/arch
History
Linus Torvalds 2245ba2a3a Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  gcc-4.6: ACPI: fix unused but set variables in ACPI
  ACPI thermal: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI video: make procfs I/F depend on CONFIG_ACPI_PROCFS
  ACPI processor: remove deprecated ACPI procfs I/F
  ACPI power_resource: remove unused procfs I/F
  ACPI: remove deprecated ACPI procfs I/F
  ACPI: introduce drivers/acpi/sysfs.c
  ACPI: introduce module parameter acpi.aml_debug_output
  ACPI: introduce drivers/acpi/debugfs.c
  ACPI, APEI, ERST debug support
  ACPI, APEI, Manage GHES as platform devices
  ACPI, APEI, Rename CPER and GHES severity constants
  ACPI, APEI, Fix a typo of error path of apei_resources_request
  ACPI / ACPICA: Fix reference counting problems with GPE handlers
  ACPI: Add the check of ADR flag in course of finding ACPI handle for PCI device
  ACPI / Sleep: Drop acpi_suspend_finish()
  ACPI / Sleep: Consolidate suspend and hibernation routines
  ACPI / Wakeup: Simplify enabling of wakeup devices
  ACPI / Sleep: Rework enabling wakeup devices
  ACPI / Sleep: Free NVS copy if suspending of devices fails

Fixed up totally buggered "ACPI: fix unused but set variables in ACPI"
patch that doesn't even compile in the merge.

Thanks to Sedat Dilek <sedat.dilek@googlemail.com> for noticing the
breakage before I even pulled.  And a big "Grrr.." at Len for not even
bothering to compile the tree before asking me to pull.
2010-08-15 17:37:07 -07:00
..
alpha defconfig reduction 2010-08-14 22:26:53 +02:00
arm Merge git://git.infradead.org/mtd-2.6 2010-08-15 17:32:47 -07:00
avr32 defconfig reduction 2010-08-14 22:26:53 +02:00
blackfin Merge git://git.infradead.org/mtd-2.6 2010-08-15 17:32:47 -07:00
cris defconfig reduction 2010-08-14 22:26:53 +02:00
frv defconfig reduction 2010-08-14 22:26:53 +02:00
h8300 defconfig reduction 2010-08-14 22:26:53 +02:00
ia64 defconfig reduction 2010-08-14 22:26:53 +02:00
m32r defconfig reduction 2010-08-14 22:26:53 +02:00
m68k defconfig reduction 2010-08-14 22:26:53 +02:00
m68knommu defconfig reduction 2010-08-14 22:26:53 +02:00
microblaze defconfig reduction 2010-08-14 22:26:53 +02:00
mips Merge git://git.infradead.org/mtd-2.6 2010-08-15 17:32:47 -07:00
mn10300 defconfig reduction 2010-08-14 22:26:53 +02:00
parisc defconfig reduction 2010-08-14 22:26:53 +02:00
powerpc archs: replace unifdef-y with header-y 2010-08-14 22:26:51 +02:00
s390 defconfig reduction 2010-08-14 22:26:53 +02:00
score defconfig reduction 2010-08-14 22:26:53 +02:00
sh defconfig reduction 2010-08-14 22:26:53 +02:00
sparc defconfig reduction 2010-08-14 22:26:53 +02:00
tile Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile 2010-08-15 17:31:43 -07:00
um Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
x86 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2010-08-15 17:37:07 -07:00
xtensa Mark arguments to certain syscalls as being const 2010-08-13 16:53:13 -07:00
.gitignore
Kconfig Merge branch 'perf/nmi' into perf/core 2010-08-05 08:45:05 +02:00