Olof Johansson e0d20b69d3 Merge branch 'gic/cleanup' into next/soc ...

Merge in the gic cleanup since it has a handful of annoying internal conflicts
with soc development branches. All of them are delete/delete conflicts.

* gic/cleanup:
  irqchip: vic: add include of linux/irq.h
  irqchip: gic: Perform the gic_secondary_init() call via CPU notifier
  irqchip: gic: Call handle_bad_irq() directly
  arm: Move chained_irq_(enter|exit) to a generic file
  arm: Move the set_handle_irq and handle_arch_irq declarations to asm/irq.h

Signed-off-by: Olof Johansson <olof@lixom.net>

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-socfpga/platsmp.c

2013-04-28 15:06:56 -07:00

..

alpha

alpha: irq: remove deprecated use of IRQF_DISABLED

2013-04-07 12:59:30 -07:00

arc

ARC: Fix the typo in event identifier flags used by ptrace

2013-03-20 18:45:45 +05:30

arm

Merge branch 'gic/cleanup' into next/soc

2013-04-28 15:06:56 -07:00

arm64

Fix IS_ENABLED() usage typo (missing CONFIG_ prefix).

2013-03-28 13:45:49 -07:00

avr32

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

blackfin

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

c6x

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

2013-02-26 20:16:07 -08:00

cris

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

frv

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

h8300

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

hexagon

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

2013-02-26 20:16:07 -08:00

ia64

ia64 idle: delete stale (*idle)() function pointer

2013-03-29 11:12:25 -07:00

m32r

UAPI: fix endianness conditionals in M32R's asm/stat.h

2013-03-13 15:21:49 -07:00

m68k

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

metag

metag: Inhibit NUMA balancing.

2013-03-04 10:29:19 +00:00

microblaze

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

mips

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus

2013-04-05 12:23:12 -07:00

mn10300

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

openrisc

openrisc: remove HAVE_VIRT_TO_BUS

2013-03-13 06:12:39 +01:00

parisc

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

powerpc

powerpc: define the conditions where the ePAPR idle hcall can be supported

2013-03-26 08:47:27 +11:00

s390

s390/mm: provide emtpy check_pgt_cache() function

2013-04-02 08:53:11 +02:00

score

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

sh

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

sparc

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

2013-03-19 14:47:11 -07:00

tile

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

2013-04-01 08:17:09 -07:00

um

um: Use tty_port in SIGWINCH handler

2013-03-11 10:08:04 +01:00

unicore32

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

x86

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm

2013-04-07 13:01:25 -07:00

xtensa

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00

.gitignore

…

Kconfig

Select VIRT_TO_BUS directly where needed

2013-03-12 11:16:40 -07:00