msm-4.14/drivers at d2819f80d465672b09c2f4cb52303b7f951c4d0f - msm-4.14 - HostKita Git

malhuda/msm-4.14

mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00

History

Arnd Bergmann d2819f80d4 Merge branch 'spear/pinctrl' into spear/clock

Conflicts:
	arch/arm/mach-spear3xx/Makefile
	arch/arm/mach-spear3xx/clock.c
	arch/arm/mach-spear3xx/include/mach/generic.h
	arch/arm/mach-spear6xx/clock.c
	arch/arm/plat-spear/Makefile
	drivers/pinctrl/core.c

This resolves some annoying merge conflicts.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-05-14 15:33:42 +02:00

..

…

Revert "ACPI: ignore FADT reset-reg-sup flag"

2012-04-20 11:19:35 -07:00

ARM: 7366/3: amba: Remove AMBA level regulator support

2012-04-13 14:04:08 +01:00

libata: forbid port runtime pm by default, fixing regression

2012-04-18 14:33:25 -04:00

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

…

drivers/base: fix compiler warning in SoC export driver - idr should be ida

2012-04-09 14:54:22 -07:00

bcma: fix build error on MIPS; implicit pcibios_enable_device

2012-04-10 14:13:30 -04:00

Fixes in various components:

2012-04-20 11:31:00 -07:00

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth

2012-04-09 15:47:49 -04:00

…

tty and serial fixes for 3.4-rc2

2012-04-12 15:36:33 -07:00

SPEAr: Switch to common clock framework

2012-05-12 21:44:12 +02:00

Revert "clocksource: Load the ACPI PM clocksource asynchronously"

2012-04-12 00:05:05 +02:00

…

cpufreq: OMAP: fix build errors: depends on ARCH_OMAP2PLUS

2012-04-13 17:57:40 -07:00

Merge branches 'idle-fix' and 'misc' into release

2012-04-06 21:48:59 -04:00

crypto: talitos - properly lock access to global talitos registers

2012-04-09 15:13:40 +08:00

…

ARM: global cleanups

2012-03-27 16:03:32 -07:00

…

dmaengine: Kconfig: fix Atmel at_hdmac entry

2012-04-17 16:29:41 +02:00

Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2012-04-06 17:56:20 -07:00

…

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

…

gpio/exynos: Fix compiler warning in gpio-samsung.c file

2012-04-10 22:15:39 -06:00

kill mm argument of vm_munmap()

2012-04-21 01:58:20 -04:00

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid

2012-04-20 10:39:33 -07:00

…

…

hwmon: (ads1015) Fix build warning

2012-04-18 11:15:50 -07:00

…

i2c: prevent spurious interrupt on Designware controllers

2012-04-10 08:09:03 -07:00

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

…

Add a fix for a bug hit by Alexey Shvetsov in ib_srtp that hits on

2012-04-12 18:51:32 -07:00

mfd: Convert twl6040 to i2c driver, and separate it from twl core

2012-04-16 16:45:34 +02:00

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

tty and serial fixes for 3.4-rc2

2012-04-12 15:36:33 -07:00

leds-atmel-pwm.c: Make pwmled_probe() __devinit

2012-04-17 16:29:31 +02:00

…

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

…

md/bitmap: prevent bitmap_daemon_work running while initialising bitmap

2012-04-12 16:05:06 +10:00

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-04-21 12:43:23 -07:00

…

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

mfd: Fix modular builds of rc5t583 regulator support

2012-04-16 21:27:07 +02:00

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

mmc: core: Do not pre-claim host in suspend

2012-04-20 21:52:13 -04:00

fix breakage in mtdchar_open(), sanitize failure exits

2012-04-09 01:38:55 -04:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-04-12 14:04:33 -07:00

…

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

dt: add property iteration helpers

2012-04-18 13:53:11 +02:00

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

Disintegrate and delete asm/system.h

2012-03-28 15:58:21 -07:00

…

PCI: Retry BARs restoration for Type 0 headers only

2012-04-16 18:33:35 -07:00

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia

2012-03-29 16:00:48 -07:00

Merge branches 'depends/pinctrl/devel' and 'depends/rmk/clkdev' into spear/pinctrl

2012-05-12 20:38:42 +02:00

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

2012-03-30 16:45:39 -07:00

Various small bugfixes and enhancements, plus two new drivers:

2012-03-30 16:09:02 -07:00

…

…

…

…

regulator: Fix a build warning in the anatop driver for 3.4

2012-04-10 10:26:41 -07:00

simple_open: automatically convert to simple_open()

2012-04-05 15:25:50 -07:00

…

drivers/rtc/rtc-pl031.c: enable clock on all ST variants

2012-04-12 13:12:12 -07:00

[S390] s390/char/vmur.c: fix memory leak

2012-04-11 14:28:24 +02:00

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

SCSI: Fix error handling when no ULD is attached

2012-04-15 11:08:53 -07:00

…

SuperH updates for 3.4 merge window

2012-03-30 00:09:17 -07:00

…

Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm

2012-04-15 17:35:19 -07:00

…

Staging tree fixes for 3.4-rc2

2012-04-12 15:35:12 -07:00

tcm_fc: Do not free tpg structure during wq allocation failure

2012-04-06 18:57:05 -07:00

…

…

drivers/tty/amiserial.c: add missing tty_unlock

2012-04-19 19:15:35 -07:00

…

ARM: SoC fixes for 3.4-rc

2012-04-21 12:45:52 -07:00

uwb: fix error handling

2012-04-18 13:15:51 -07:00

tools/virtio: fix up vhost/test module build

2012-04-12 10:35:42 +03:00

ARM: a few more SoC fixes for 3.4-rc

2012-04-15 11:14:54 -07:00

…

virtio_balloon: fix handling of PAGE_SIZE != 4k

2012-04-15 11:51:06 +03:00

…

…

ARM: cleanups of io includes

2012-03-29 18:02:10 -07:00

xen/resume: Fix compile warnings.

2012-04-19 15:12:49 -04:00

…

Kconfig

Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

2012-04-02 09:50:40 -07:00

Makefile

Merge branch 'for-next' of git://gitorious.org/kernel-hsi/kernel-hsi

2012-04-02 09:50:40 -07:00