Arnd Bergmann 797b3a9ee7 Merge branch 'gic/cleanup' into next/soc2 ...

Both zynq and shmobile have conflicts against the gic cleanup
series, resolved here.

Conflicts:
	arch/arm/mach-shmobile/smp-emev2.c
	arch/arm/mach-shmobile/smp-r8a7779.c
	arch/arm/mach-shmobile/smp-sh73a0.c
	arch/arm/mach-zynq/platsmp.c
	drivers/gpio/gpio-pl061.c

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

2013-04-08 18:59:19 +02:00

..

acpi

Merge tag 'stable/for-linus-3.9-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen

2013-03-12 20:25:53 -07:00

asm-generic

asm-generic: move cmpxchg*_local defs to cmpxchg.h

2013-03-13 06:11:05 +01:00

clocksource

Merge tag 'metag-v3.9-rc1-v4' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag

2013-03-03 12:06:09 -08:00

crypto

…

drm

drm/radeon: add Richland pci ids

2013-03-15 18:47:19 -04:00

keys

…

linux

Merge branch 'gic/cleanup' into next/soc2

2013-04-08 18:59:19 +02:00

math-emu

…

media

[media] media: ov7670: Add possibility to disable pixclk during hblank

2013-02-08 14:35:06 -02:00

memory

…

misc

…

net

ipv4: Fix ip-header identification for gso packets.

2013-03-26 13:50:05 -04:00

pcmcia

…

ras

edac: add support for error type "Info"

2013-02-21 14:16:27 -03:00

rdma

IB/core: Add "type 2" memory windows support

2013-02-21 11:51:45 -08:00

rxrpc

…

scsi

Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

2013-03-02 11:42:16 -08:00

sound

Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

2013-02-28 20:00:40 -08:00

target

target: Rename spc_get_write_same_sectors -> sbc_get_write_same_sectors

2013-02-23 12:46:14 -08:00

trace

Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4

2013-03-02 19:33:21 -08:00

uapi

net: fix *_DIAG_MAX constants

2013-03-21 12:36:33 -04:00

video

ARM: at91: fix LCD-wiring mode

2013-03-13 11:05:04 +01:00

xen

Merge tag 'for-linus-20130331' of git://git.kernel.dk/linux-block

2013-03-31 11:38:59 -07:00

Kbuild

UAPI: Remove empty Kbuild files

2013-01-02 17:36:10 -08:00