David S. Miller 7e52b33bd5 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	net/ipv6/route.c

This deals with a merge conflict between the net-next addition of the
inetpeer network namespace ops, and Thomas Graf's bug fix in
2a0c451ade which makes sure we don't
register /proc/net/ipv6_route before it is actually safe to do so.

Signed-off-by: David S. Miller <davem@davemloft.net>

2012-06-15 15:51:55 -07:00

..

alpha

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

2012-06-01 11:53:44 -07:00

arm

Merge tag 'omapdss-for-3.5-rc2' of git://gitorious.org/linux-omap-dss2/linux

2012-06-13 17:57:30 +03:00

avr32

fixups for signal breakage

2012-06-04 17:47:34 -04:00

blackfin

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

2012-06-05 09:47:15 -07:00

c6x

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

cris

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

2012-06-01 11:53:44 -07:00

frv

frv: Remove bogus closing parenthesis

2012-06-02 10:38:19 -04:00

h8300

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

2012-06-01 11:53:44 -07:00

hexagon

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

ia64

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

2012-06-01 11:53:44 -07:00

m32r

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

2012-06-01 11:53:44 -07:00

m68k

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

2012-06-13 23:17:12 +03:00

microblaze

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

mips

Merge tag 'for-linus-3.5-20120601' of git://git.infradead.org/linux-mtd

2012-06-01 16:55:42 -07:00

mn10300

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

2012-06-01 11:53:44 -07:00

openrisc

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

parisc

[PARISC] fix code to find libgcc

2012-06-05 14:10:23 +09:00

powerpc

powerpc: Fix kernel panic during kernel module load

2012-06-08 19:59:08 +10:00

s390

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

2012-06-01 11:53:44 -07:00

score

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

sh

Merge branches 'sh/urgent', 'sh/core', 'sh/clockevents', 'sh/asm-generic' and 'sh/trivial' into sh-fixes-for-linus

2012-06-13 12:01:33 +09:00

sparc

sparc bpf_jit: support BPF_S_ANC_ALU_XOR_X instruction

2012-06-06 10:20:21 -07:00

tile

tile: add #include to unbreak build after generic init_task conversion

2012-06-06 11:29:35 -04:00

um

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

unicore32

new helper: signal_delivered()

2012-06-01 12:58:52 -04:00

x86

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

2012-06-15 15:51:55 -07:00

xtensa

fixups for signal breakage

2012-06-04 17:47:34 -04:00

.gitignore

…

Kconfig

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

2012-05-25 09:18:59 -07:00