linux-stable/drivers
Anton Vorontsov 76d8a23b12 Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
The merge is merely to fix conflicts before sending a pull request.

Conflicts:
	drivers/power/ab8500_btemp.c
	drivers/power/ab8500_charger.c
	drivers/power/ab8500_fg.c
	drivers/power/abx500_chargalg.c
	drivers/power/max8925_power.c

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
2012-12-11 22:15:57 -08:00
..
accessibility
acpi Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
amba
ata SCSI fixes on 20121122 2012-11-22 09:14:54 -10:00
atm atm: forever loop loading ambassador firmware 2012-11-28 11:38:11 -05:00
auxdisplay
base Merge branch 'akpm' (Andrew's patchbomb) 2012-12-11 18:05:37 -08:00
bcma
block mtip32xx: Fix padding issue 2012-11-23 14:32:55 +01:00
bluetooth
bus
cdrom
char TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
clk Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
clocksource
connector
cpufreq ACPI and power management updates for 3.8-rc1 2012-12-11 12:45:35 -08:00
cpuidle cpuidle: Measure idle state durations with monotonic clock 2012-11-27 14:17:58 +01:00
crypto IXP4xx crypto: MOD_AES{128,192,256} already include key size. 2012-11-22 03:36:15 +00:00
dca
devfreq Merge branch 'pm-devfreq' 2012-12-07 23:13:36 +01:00
dio
dma dma: remove use of __devinit 2012-11-28 12:42:36 -08:00
edac Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp 2012-12-11 11:28:43 -08:00
eisa
extcon extcon: remove use of __devexit_p 2012-11-26 15:57:24 -08:00
firewire Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
firmware
gpio Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
gpu Revert "revert "Revert "mm: remove __GFP_NO_KSWAPD""" and associated damage 2012-12-10 11:03:05 -08:00
hid
hsi
hv hv: hv_balloon: mark a function static 2012-11-21 12:46:40 -08:00
hwmon Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
hwspinlock hwspinlock: remove use of __devexit 2012-11-28 11:41:36 -08:00
i2c ACPI and power management updates for 3.8-rc1 2012-12-11 12:45:35 -08:00
ide
idle cpuidle: Measure idle state durations with monotonic clock 2012-11-27 14:17:58 +01:00
iio iio: imu: adis16480: remove duplicated include from adis16480.c 2012-11-30 13:11:46 +00:00
infiniband
input Input: matrix-keymap - provide proper module license 2012-12-10 16:10:05 -08:00
iommu
ipack TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
irqchip
isdn TTY: isdn/gigaset destroy tty_port properly 2012-11-21 15:13:36 -08:00
leds Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
lguest
macintosh bootmem: fix wrong call parameter for free_bootmem() 2012-12-11 17:22:28 -08:00
md Single bugfix for raid1/raid10. 2012-12-02 16:24:31 -08:00
media [media] s5p-mfc: Handle multi-frame input buffer 2012-11-26 18:43:27 -02:00
memory
memstick
message
mfd Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
misc TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
mmc TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
mtd ACPI and power management updates for 3.8-rc1 2012-12-11 12:45:35 -08:00
net TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
nfc NFC: Fix pn533 target mode memory leak 2012-11-20 00:09:26 +01:00
nubus
of Fix build when CONFIG_W1_MASTER_GPIO=m b exporting "allnodes" 2012-11-30 10:04:06 +00:00
oprofile
parisc
parport
pci Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
pcmcia pcmcia: remove use of __devexit 2012-11-28 12:10:16 -08:00
pinctrl Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
platform
pnp Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
power Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux 2012-12-11 22:15:57 -08:00
pps
ps3
ptp ptp: remove use of __devexit 2012-11-28 12:12:32 -08:00
pwm pwm: remove use of __devexit 2012-11-28 12:23:41 -08:00
rapidio Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
regulator
remoteproc remoteproc: fix error path of ->find_vqs 2012-11-29 10:05:09 +02:00
rpmsg
rtc drivers/rtc/rtc-tps65910.c: fix invalid pointer access on _remove() 2012-11-30 08:51:18 -08:00
s390
sbus
scsi megaraid: fix BUG_ON() from incorrect use of delayed work 2012-12-04 07:29:47 -08:00
sfi
sh
sn
spi ACPI and power management updates for 3.8-rc1 2012-12-11 12:45:35 -08:00
ssb
staging Merge branch 'akpm' (Andrew's patchbomb) 2012-12-11 18:05:37 -08:00
target
tc
thermal
tty TTY/Serial merge for 3.8-rc1 2012-12-11 14:08:47 -08:00
uio drivers: uio: Only allocate new private data when probing device tree node 2012-11-21 13:44:10 -08:00
usb USB patches for 3.8-rc1 2012-12-11 14:48:20 -08:00
uwb uwb: fix uwb_dev_unlock() missed at an error path in uwb_rc_cmd_async() 2012-11-26 15:58:43 -08:00
vfio
vhost vhost: fix length for cross region descriptor 2012-11-28 11:27:01 -05:00
video Driver core updates for 3.8-rc1 2012-12-11 13:13:55 -08:00
virt
virtio virtio_balloon: introduce migration primitives to balloon pages 2012-12-11 17:22:27 -08:00
vlynq
vme
w1 w1-gpio: Simplify & get rid of defines 2012-11-26 16:16:35 -08:00
watchdog watchdog: remove use of __devexit 2012-11-28 12:00:24 -08:00
xen Char/Misc driver merge for 3.8-rc1 2012-12-11 13:56:38 -08:00
zorro
Kconfig
Makefile