Linus Torvalds
08acd4f8af
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: (179 commits)
ACPI: Fix acpi_processor_idle and idle= boot parameters interaction
acpi: fix section mismatch warning in pnpacpi
intel_menlo: fix build warning
ACPI: Cleanup: Remove unneeded, multiple local dummy variables
ACPI: video - fix permissions on some proc entries
ACPI: video - properly handle errors when registering proc elements
ACPI: video - do not store invalid entries in attached_array list
ACPI: re-name acpi_pm_ops to acpi_suspend_ops
ACER_WMI/ASUS_LAPTOP: fix build bug
thinkpad_acpi: fix possible NULL pointer dereference if kstrdup failed
ACPI: check a return value correctly in acpi_power_get_context()
#if 0 acpi/bay.c:eject_removable_drive()
eeepc-laptop: add hwmon fan control
eeepc-laptop: add backlight
eeepc-laptop: add base driver
ACPI: thinkpad-acpi: bump up version to 0.20
ACPI: thinkpad-acpi: fix selects in Kconfig
ACPI: thinkpad-acpi: use a private workqueue
ACPI: thinkpad-acpi: fluff really minor fix
ACPI: thinkpad-acpi: use uppercase for "LED" on user documentation
...
Fixed conflicts in drivers/acpi/video.c and drivers/misc/intel_menlow.c
manually.
2008-04-30 11:52:52 -07:00
..
accessibility
Basic braille screen reader support
2008-04-30 08:29:52 -07:00
acorn /char
acpi
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-04-30 11:52:52 -07:00
amba
ata
ahci: SB600 ahci can't do MSI, blacklist that capability
2008-04-29 17:42:04 -04:00
atm
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-04-30 08:45:48 -07:00
auxdisplay
base
mm: Add NR_WRITEBACK_TEMP counter
2008-04-30 08:29:50 -07:00
block
brd: modify ramdisk device to be able to manage partitions
2008-04-30 08:29:53 -07:00
bluetooth
tty: add throttle/unthrottle helpers
2008-04-30 08:29:47 -07:00
cdrom
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
char
drivers/char: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:54 -07:00
clocksource
connector
cpufreq
[CPUFREQ] state info wrong after resume
2008-04-28 16:27:08 -04:00
cpuidle
crypto
dca
dio
dma
edac
pasemi_edac needs to include linux/edac.h
2008-04-29 19:06:57 -07:00
eisa
firewire
firmware
edd: add default mode CONFIG_EDD_OFF=n, override with edd={on,off}
2008-04-29 08:06:23 -07:00
gpio
drivers: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:53 -07:00
hid
hid-core: use get_unaligned_* helpers
2008-04-29 08:06:27 -07:00
hwmon
drivers: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:53 -07:00
i2c
i2c: Convert most new-style drivers to use module aliasing
2008-04-29 23:11:40 +02:00
ide
alim15x3: disable init_hwif_ali15x3 for PowerPC
2008-04-29 22:57:38 +02:00
ieee1394
infiniband
RDMA/nes: Formatting cleanup
2008-04-29 13:46:54 -07:00
input
tty: The big operations rework
2008-04-30 08:29:47 -07:00
isdn
tty: The big operations rework
2008-04-30 08:29:47 -07:00
leds
Remove duplicated unlikely() in IS_ERR()
2008-04-29 08:06:25 -07:00
lguest
macintosh
[POWERPC] windfarm: Add PowerMac 12,1 support
2008-04-29 15:57:35 +10:00
mca
proc: remove proc_root from drivers
2008-04-29 08:06:18 -07:00
md
md: support blocking writes to an array on device failure
2008-04-30 08:29:33 -07:00
media
fix drivers/media/common/tuners/ build bug
2008-04-30 08:36:04 -07:00
memstick
message
Remove duplicated unlikely() in IS_ERR()
2008-04-29 08:06:25 -07:00
mfd
drivers: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:53 -07:00
misc
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-04-30 11:52:52 -07:00
mmc
Merge master.kernel.org:/home/rmk/linux-2.6-arm
2008-04-29 15:18:06 -07:00
mtd
drivers: fix integer as NULL pointer warnings
2008-04-28 17:31:13 -07:00
net
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-04-30 08:45:48 -07:00
nubus
proc: convert /proc/bus/nubus to seq_file interface
2008-04-29 08:06:19 -07:00
of
oprofile
oprofile: change cpu_buffer from array to per_cpu variable
2008-04-28 08:58:31 -07:00
parisc
parisc: use non-racy method for proc entries creation
2008-04-29 08:06:22 -07:00
parport
debugobjects: add timer specific object debugging code
2008-04-30 08:29:53 -07:00
pci
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
2008-04-29 10:17:59 -07:00
pcmcia
drivers/pcmcia/pcmcia_ioctl.c: fix build
2008-04-29 11:00:39 -07:00
pnp
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-04-30 11:52:52 -07:00
power
x86: olpc: add One Laptop Per Child architecture support
2008-04-29 08:06:07 -07:00
ps3
rapidio
[RAPIDIO] Auto-probe the RapidIO system size
2008-04-29 19:40:28 +10:00
rtc
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
2008-04-30 11:52:52 -07:00
s390
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2008-04-30 08:45:48 -07:00
sbus
drivers: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:53 -07:00
scsi
Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block
2008-04-29 08:18:03 -07:00
serial
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
2008-04-30 08:37:40 -07:00
sh
sn
spi
atmel_spi: clean up baud rate divisor calculation
2008-04-30 08:29:31 -07:00
ssb
tc
telephony
thermal
thermal: re-name thermal.c to thermal_sys.c
2008-04-29 03:12:17 -04:00
uio
usb
tty: The big operations rework
2008-04-30 08:29:47 -07:00
video
pxafb: preliminary smart panel interface support (update)
2008-04-30 08:29:32 -07:00
virtio
w1
drivers: replace remaining __FUNCTION__ occurrences
2008-04-30 08:29:53 -07:00
watchdog
xen
zorro
zorro: use non-racy method for proc entries creation
2008-04-29 08:06:21 -07:00
Kconfig
Basic braille screen reader support
2008-04-30 08:29:52 -07:00
Makefile
Basic braille screen reader support
2008-04-30 08:29:52 -07:00