linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-10-14 02:14:08 -05:00

Files

T

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

acpi

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

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

asm-generic

asm-generic: add linux/types.h to cmpxchg.h

2012-04-02 14:41:27 -07:00

crypto

crypto: user - Fix lookup of algorithms with IV generator

2012-03-29 19:52:47 +08:00

drm

Merge branch 'exynos-drm-fixes' of git://git.infradead.org/users/kmpark/linux-samsung into drm-intel-fixes