kevin/linux
1
Fork 0
Code
25564dd869
linux/drivers/acpi
History
Linus Torvalds e76e5b2c66 Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6 
* 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6: (88 commits)
  PCI: fix HT MSI mapping fix
  PCI: don't enable too much HT MSI mapping
  x86/PCI: make pci=lastbus=255 work when acpi is on
  PCI: save and restore PCIe 2.0 registers
  PCI: update fakephp for bus_id removal
  PCI: fix kernel oops on bridge removal
  PCI: fix conflict between SR-IOV and config space sizing
  powerpc/PCI: include pci.h in powerpc MSI implementation
  PCI Hotplug: schedule fakephp for feature removal
  PCI Hotplug: rename legacy_fakephp to fakephp
  PCI Hotplug: restore fakephp interface with complete reimplementation
  PCI: Introduce /sys/bus/pci/devices/.../rescan
  PCI: Introduce /sys/bus/pci/devices/.../remove
  PCI: Introduce /sys/bus/pci/rescan
  PCI: Introduce pci_rescan_bus()
  PCI: do not enable bridges more than once
  PCI: do not initialize bridges more than once
  PCI: always scan child buses
  PCI: pci_scan_slot() returns newly found devices
  PCI: don't scan existing devices
  ...

Fix trivial append-only conflict in Documentation/feature-removal-schedule.txt
2009-04-01 09:47:12 -07:00
..
acpica acpi/x86: introduce __apci_map_table, v4 2009-02-09 13:35:07 +01:00
ac.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
acpi_memhotplug.c trivial: Fix misspelling of "firmware" in acpi_memhotplug.c 2009-01-06 11:28:08 +01:00
battery.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
blacklist.c ACPI: delete OSI(Linux) DMI dmesg spam 2008-11-27 01:55:21 -05:00
bus.c ACPI: remove doubled status checking 2009-03-16 00:35:30 -04:00
button.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
cm_sbs.c ACPI: remove private acpica headers from driver files 2008-12-31 01:15:22 -05:00
container.c ACPI: add missing KERN_* constants to printks 2009-02-07 00:29:32 -05:00
debug.c ACPI: remove private acpica headers from driver files 2008-12-31 01:15:22 -05:00
dock.c Driver core: implement uevent suppress in kobject 2009-03-24 16:38:26 -07:00
ec.c ACPI: EC: Add delay for slow MSI controller 2009-02-21 12:18:13 -05:00
event.c netlink: change return-value logic of netlink_broadcast() 2009-02-05 23:56:36 -08:00
fan.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
glue.c ACPI: struct device - replace bus_id with dev_name(), dev_set_name() 2009-02-07 00:41:13 -05:00
Kconfig ACPI: remove CONFIG_ACPI_SYSTEM 2009-02-21 21:59:56 -05:00
Makefile ACPI: remove CONFIG_ACPI_SYSTEM 2009-02-21 21:59:56 -05:00
numa.c acpi: check for pxm_to_node_map overflow 2009-03-16 00:35:30 -04:00
osl.c Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2 2009-03-27 17:28:43 +01:00
pci_bind.c ACPI: simplify buffer management for acpi_pci_bind() etc. 2008-12-30 22:52:26 -05:00
pci_irq.c ACPI: PCI: add HP copyright 2008-12-30 21:50:01 -05:00
pci_link.c ACPI: add missing KERN_* constants to printks 2009-02-07 00:29:32 -05:00
pci_root.c PCI/ACPI: rename pci_osc_control_set() 2009-03-19 19:29:33 -07:00
pci_slot.c Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2008-10-23 10:20:36 -07:00
power.c ACPI: power.c: call acpi_get_name to get node name 2008-12-31 01:11:51 -05:00
proc.c Merge branch 'alarm' into release 2009-01-09 03:36:32 -05:00
processor_core.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
processor_idle.c ACPI: delete CPU_IDLE=n code 2009-02-06 12:34:39 -05:00
processor_perflib.c alloc_percpu: change percpu_ptr to per_cpu_ptr 2009-02-20 16:29:08 +09:00
processor_thermal.c ACPI: consolidate ACPI_*_COMPONENT definitions in acpi_drivers.h 2008-11-07 21:44:37 -05:00
processor_throttling.c cpumask: convert shared_cpu_map in acpi_processor* structs to cpumask_var_t 2009-01-03 19:15:40 +01:00
reboot.c ACPI: reboot.c: use new acpi_reset interface 2008-12-31 01:15:00 -05:00
sbs.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
sbshc.c ACPI: remove private acpica headers from driver files 2008-12-31 01:15:22 -05:00
sbshc.h
scan.c ACPI: remove private acpica headers from driver files 2008-12-31 01:15:22 -05:00
sleep.c ACPI suspend: Blacklist Toshiba Satellite L300 that requires to set SCI_EN directly on resume 2009-03-16 00:35:29 -04:00
sleep.h ACPICA: create acpica/ directory 2009-01-09 03:30:47 -05:00
system.c ACPICA: New: acpi_get_gpe_device interface 2008-12-31 01:10:24 -05:00
tables.c acpi/x86: introduce __apci_map_table, v4 2009-02-09 13:35:07 +01:00
thermal.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
utils.c ACPI: scheduling in atomic via acpi_evaluate_integer () 2008-11-26 17:39:06 -05:00
video_detect.c ACPI: ec.c, pci_link.c, video_detec.c: static 2008-12-30 23:27:04 -05:00
video.c proc 2/2: remove struct proc_dir_entry::owner 2009-03-31 01:14:44 +04:00
wakeup.c ACPICA: create acpica/ directory 2009-01-09 03:30:47 -05:00