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

crypto: skcipher - Add ablkcipher_walk interfaces

2010-05-19 14:13:07 +10:00

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

keys

DNS: Separate out CIFS DNS Resolver code

2010-08-05 17:17:51 +00:00

linux

Merge git://git.infradead.org/battery-2.6

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

math-emu

math-emu: correct test for downshifting fraction in _FP_FROM_INT()

2010-07-20 18:45:14 -07:00

media

V4L/DVB: cx2341x: convert to the control framework

2010-08-08 23:43:05 -03:00

mtd

mtd: Update copyright notices

2010-08-08 20:58:20 +01:00

net

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6

2010-08-06 13:30:43 -07:00

pcmcia

pcmcia: use struct resource for PCMCIA devices, part 2

2010-08-03 09:04:16 +02:00

rdma

IB: Rename RAW_ETY to RAW_ETHERTYPE

2010-08-04 10:44:19 -07:00

rxrpc

net: use __packed annotation

2010-06-03 03:21:52 -07:00

scsi

scsi: use __uX types for headers exported to user space

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

sound

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

2010-08-07 17:07:31 -07:00

trace

Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block

2010-08-10 15:22:42 -07:00

video

fbdev: sh-mobile: HDMI support for SH-Mobile SoCs

2010-08-04 16:12:15 +09:00

xen

Merge branch 'stable/xen-swiotlb-0.8.6' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2010-08-12 09:09:41 -07:00

Kbuild

…