iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/drivers
History
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
..
accessibility
…
acpi
acpi: fix bogus preemption logic
2010-08-12 08:43:29 -07:00
amba
ARM: AMBA: Add pclk support to AMBA bus infrastructure
2010-07-31 13:07:27 +01:00
ata
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
atm
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
auxdisplay
…
base
drivers/base/node.c: reduce stack usage of node_read_meminfo()
2010-08-09 20:45:02 -07:00
block
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
bluetooth
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
cdrom
block: push down BKL into .open and .release
2010-08-07 18:25:34 +02:00
char
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
clocksource
…
connector
…
cpufreq
[CPUFREQ] fix brace coding style issue.
2010-08-03 13:47:05 -04:00
cpuidle
cpuidle: extend cpuidle and menu governor to handle dynamic states
2010-08-09 20:45:04 -07:00
crypto
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
dca
…
dio
…
dma
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
edac
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
eisa
…
firewire
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
firmware
edd: fix possible memory leak in edd_init() error path
2010-08-09 20:45:09 -07:00
gpio
gpio: sx150x: add Semtech I2C sx150x gpio expander driver
2010-08-11 08:59:09 -07:00
gpu
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
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2010-08-10 15:08:02 -07:00
hwmon
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
i2c
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
ide
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
idle
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq
2010-08-04 11:13:36 -07:00
ieee1394
Merge firewire branches to be released post v2.6.35
2010-08-02 10:09:04 +02:00
ieee802154
…
infiniband
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
input
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
isdn
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
2010-08-09 21:05:52 -07:00
leds
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
lguest
…
macintosh
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
mca
…
md
Merge branch 'for-linus' of git://neil.brown.name/md
2010-08-10 15:38:19 -07:00
media
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
memstick
memstick: fix hangs on unexpected device removal in mspro_blk
2010-08-12 08:43:31 -07:00
message
fusion: fix kernel-doc warnings
2010-08-11 08:59:12 -07:00
mfd
…
misc
cs5535-mfgpt: reuse timers that have never been set up
2010-08-11 08:59:20 -07:00
mmc
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
mtd
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
net
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
nubus
…
of
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
oprofile
…
parisc
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-08-04 15:31:02 -07:00
parport
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
pci
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
2010-08-09 21:00:07 -07:00
pcmcia
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
platform
ips driver: make it less chatty
2010-08-03 11:55:15 -04:00
pnp
…
power
Merge git://git.infradead.org/battery-2.6
2010-08-12 09:58:33 -07:00
pps
…
ps3
…
rapidio
…
regulator
regulator: Remove owner field from attribute initialization in regulator core driver
2010-08-05 13:53:35 -07:00
rtc
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
s390
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
sbus
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
scsi
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
serial
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
sfi
…
sh
sh: add a reparent function to DIV6 clocks
2010-08-04 16:12:01 +09:00
sn
…
spi
of/device: Replace struct of_device with struct platform_device
2010-08-06 09:25:50 -06:00
ssb
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
2010-08-06 12:25:06 -07:00
staging
Merge branch 'for-2.6.36' of git://git.kernel.dk/linux-2.6-block
2010-08-10 15:22:42 -07:00
tc
…
telephony
pcmcia: do not use io_req_t when calling pcmcia_request_io()
2010-08-03 09:04:11 +02:00
thermal
…
uio
uio: Remove IRQF_DISABLED flag from uio_cif.c
2010-08-05 13:53:33 -07:00
usb
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
uwb
…
vhost
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
2010-08-04 11:47:58 -07:00
video
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07:00
virtio
…
vlynq
…
w1
…
watchdog
Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6
2010-08-12 09:11:31 -07: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
zorro
zorro: Fix reading of proc/bus/zorro/* in small chunks
2010-08-09 21:14:08 +02:00
Kconfig
…
Makefile
…