linux/drivers
Linus Torvalds c4ec207173 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: (41 commits)
  ACPICA: hw: Don't carry spinlock over suspend
  ACPICA: hw: remove use_lock flag from acpi_hw_register_{read, write}
  ACPI: cpuidle: port idle timer suspend/resume workaround to cpuidle
  ACPI: clean up acpi_enter_sleep_state_prep
  Hibernation: Make sure that ACPI is enabled in acpi_hibernation_finish
  ACPI: suppress uninitialized var warning
  cpuidle: consolidate 2.6.22 cpuidle branch into one patch
  ACPI: thinkpad-acpi: skip blanks before the data when parsing sysfs
  ACPI: AC: Add sysfs interface
  ACPI: SBS: Add sysfs alarm
  ACPI: SBS: Add ACPI_PROCFS around procfs handling code.
  ACPI: SBS: Add support for power_supply class (and sysfs)
  ACPI: SBS: Make SBS reads table-driven.
  ACPI: SBS: Simplify data structures in SBS
  ACPI: SBS: Split host controller (ACPI0001) from SBS driver (ACPI0002)
  ACPI: EC: Add new query handler to list head.
  ACPI: Add acpi_bus_generate_event4() function
  ACPI: Battery: add sysfs alarm
  ACPI: Battery: Add sysfs support
  ACPI: Battery: Misc clean-ups, no functional changes
  ...

Fix up conflicts in drivers/misc/thinkpad_acpi.[ch] manually
2007-10-19 13:12:46 -07:00
..
acorn/char
acpi Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2007-10-19 13:12:46 -07:00
amba
ata
atm
auxdisplay
base
block Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
bluetooth
cdrom Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
char Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
clocksource
connector
cpufreq
cpuidle
crypto
dca
dio
dma
edac NULL terminate the pci_device_ids in pasemi_edac 2007-10-19 11:53:56 -07:00
eisa
fc4
firewire
firmware define global BIT macro 2007-10-19 11:53:42 -07:00
hid Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
hwmon get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
i2c i2c-pxa, rename BIT macro to PXA_BIT 2007-10-19 11:53:42 -07:00
ide remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
ieee1394
infiniband
input define global BIT macro 2007-10-19 11:53:42 -07:00
isdn isdn/sc: remove unused REQUEST_IRQ and unnecessary header file 2007-10-19 11:53:34 -07:00
kvm
leds
lguest
macintosh get rid of input BIT* duplicate defines 2007-10-19 11:53:42 -07:00
mca
md Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
media Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
message
mfd
misc Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2007-10-19 13:12:46 -07:00
mmc
mtd Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
net Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2007-10-19 13:12:46 -07:00
nubus
of
oprofile
parisc
parport
pci
pcmcia remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
pnp
power
ps3 remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
rapidio
rtc remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
s390 remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
sbus
scsi Change struct marker users 2007-10-19 11:53:53 -07:00
serial amba-pl011, rename BIT macro 2007-10-19 11:53:42 -07:00
sh
sn
spi
ssb
tc
telephony
uio
usb Use helpers to obtain task pid in printks 2007-10-19 11:53:43 -07:00
video define global BIT macro 2007-10-19 11:53:42 -07:00
w1
watchdog remove asm/bitops.h includes 2007-10-19 11:53:41 -07:00
xen
zorro
Kconfig
Makefile Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 2007-10-19 13:12:46 -07:00