You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
David S. Miller
5e30589521
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
|
16 years ago |
| .. |
|
acpica
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
Kconfig
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
Makefile
|
…
|
|
|
ac.c
|
…
|
|
|
acpi_memhotplug.c
|
…
|
|
|
battery.c
|
…
|
|
|
blacklist.c
|
…
|
|
|
bus.c
|
…
|
|
|
button.c
|
…
|
|
|
cm_sbs.c
|
…
|
|
|
container.c
|
ACPI: add missing KERN_* constants to printks
|
16 years ago |
|
debug.c
|
…
|
|
|
dock.c
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
ec.c
|
ACPI: Fix crash on ASUS laptops
|
16 years ago |
|
event.c
|
netlink: change return-value logic of netlink_broadcast()
|
16 years ago |
|
fan.c
|
…
|
|
|
glue.c
|
ACPI: struct device - replace bus_id with dev_name(), dev_set_name()
|
16 years ago |
|
numa.c
|
…
|
|
|
osl.c
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
pci_bind.c
|
…
|
|
|
pci_irq.c
|
…
|
|
|
pci_link.c
|
ACPI: add missing KERN_* constants to printks
|
16 years ago |
|
pci_root.c
|
…
|
|
|
pci_slot.c
|
…
|
|
|
power.c
|
…
|
|
|
proc.c
|
…
|
|
|
processor_core.c
|
…
|
|
|
processor_idle.c
|
ACPI: delete CPU_IDLE=n code
|
16 years ago |
|
processor_perflib.c
|
ACPI: cpufreq: Remove deprecated /proc/acpi/processor/../performance proc entries
|
16 years ago |
|
processor_thermal.c
|
…
|
|
|
processor_throttling.c
|
…
|
|
|
reboot.c
|
…
|
|
|
sbs.c
|
…
|
|
|
sbshc.c
|
…
|
|
|
sbshc.h
|
…
|
|
|
scan.c
|
…
|
|
|
sleep.c
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
sleep.h
|
…
|
|
|
system.c
|
…
|
|
|
tables.c
|
ACPI: disable ACPI cleanly when bad RSDP found
|
16 years ago |
|
thermal.c
|
…
|
|
|
utils.c
|
…
|
|
|
video.c
|
Merge branches 'release', 'asus', 'bugzilla-12450', 'cpuidle', 'debug', 'ec', 'misc', 'printk' and 'processor' into release
|
16 years ago |
|
video_detect.c
|
…
|
|
|
wakeup.c
|
…
|
|
