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

..

alpha

alpha: fix build failures from system.h dismemberment

2012-04-13 13:15:16 -04:00

arm

Merge branch 'spear/pinctrl' into spear/clock

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

avr32

avr32: fix nop compile fails from system.h split up

2012-04-04 08:23:44 -07:00

blackfin

blackfin: update defconfig for bf527-ezkit

2012-04-06 10:25:03 +08:00

c6x

irq: Kill pointless irqd_to_hw export

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

cris

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

frv

frv: fix warnings in mb93090-mb00/pci-dma.c about implicit EXPORT_SYMBOL

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

h8300

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

hexagon

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

ia64

kill mm argument of vm_munmap()

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

m32r

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

m68k

m68knommu: make sure 2nd FEC eth interface pins are enabled on 5275 ColdFire

2012-04-17 17:06:34 +10:00

microblaze

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

mips

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

mn10300

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

openrisc

Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system

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

parisc

parisc: fix missing cmpxchg file error from system.h split

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

powerpc

Merge tag 'irqdomain-for-linus' of git://git.secretlab.ca/git/linux-2.6

2012-04-12 12:49:56 -07:00

s390

[S390] Fix compile error in swab.h

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

score

Delete all instances of asm/system.h

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

sh

Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh

2012-04-07 09:52:46 -07:00

sparc

sparc32,leon: add notify_cpu_starting()

2012-04-21 16:35:06 -04:00

tile

VM: add "vm_mmap()" helper function

2012-04-20 17:29:13 -07:00

um

um: uml_setup_stubs': warning: unused variable 'pages'

2012-04-10 00:13:45 +02:00

unicore32

Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

2012-04-04 17:13:43 -07:00

x86

kill mm argument of vm_munmap()

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

xtensa

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

.gitignore

…

Kconfig

Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile

2012-03-29 14:49:45 -07:00