linux-st

Files

Linus Torvalds 16bb85bc12 Merge git://git.infradead.org/battery-2.6

* git://git.infradead.org/battery-2.6:
  intel_mid_battery: Fix battery scaling
  intel_mid_battery: Fix the argument order to intel_scu_ipc_command
  olpc_battery: Fix build failure caused by sysfs changes
  Add s3c-adc-battery driver
  Intel MID platform battery driver

Fix up trivial conflicts (battery drivers added from different branches)
in drivers/power/{Kconfig,Makefile}

2010-08-12 09:58:33 -07:00

acpi

acpi: fix bogus preemption logic

2010-08-12 08:43:29 -07:00

asm-generic

dma-mapping: remove dma_is_consistent API

2010-08-11 08:59:21 -07:00

crypto

…

drm

Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

2010-08-12 09:21:39 -07:00