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

Conflicts:
	drivers/net/wireless/iwlwifi/pcie/trans.c
	include/linux/inetdevice.h

The inetdevice.h conflict involves moving the IPV4_DEVCONF values
into a UAPI header, overlapping additions of some new entries.

The iwlwifi conflict is a context overlap.

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

2013-08-26 16:37:08 -04:00

..

alpha

alpha: Use handle_percpu_irq for the timer interrupt

2013-07-19 13:54:26 -07:00

arc

ARC: SMP build breakage

2013-07-26 15:34:22 -07:00

arm

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

2013-08-26 16:37:08 -04:00

arm64

Perf backend fixes for arm64 where the user can cause kernel panic

2013-08-21 16:36:32 -07:00

avr32

avr32: boards/atngw100/mrmt.c: fix building error

2013-08-08 14:16:22 +02:00

blackfin

Merge branch 'cpuinit_phase2' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux

2013-07-18 10:50:26 -07:00

c6x

Merge branch 'akpm' (updates from Andrew Morton)

2013-07-03 17:12:13 -07:00

cris

cris: delete __cpuinit usage from all cris files

2013-07-14 19:36:54 -04:00

frv

frv: delete __cpuinit usage from all frv files

2013-07-14 19:36:55 -04:00

h8300

net: rename busy poll socket op and globals

2013-07-10 17:08:27 -07:00

hexagon

arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"

2013-08-13 17:57:49 -07:00

ia64

Fix TLB gather virtual address range invalidation corner cases

2013-08-16 08:52:46 -07:00

m32r

m32r: delete __cpuinit usage from all m32r files

2013-07-14 19:36:55 -04:00

m68k

m68k: Truncate base in do_div()

2013-08-14 11:46:30 +02:00

metag

metag: delete __cpuinit usage from all metag files

2013-07-14 19:36:54 -04:00

microblaze

microblaze: fix clone syscall

2013-08-13 17:57:48 -07:00

mips

MIPS: Handle OCTEON BBIT instructions in FPU emulator.

2013-08-20 19:17:40 +02:00

mn10300

net: rename busy poll socket op and globals

2013-07-10 17:08:27 -07:00

openrisc

arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"

2013-08-13 17:57:49 -07:00

parisc

parisc: Fix interrupt routing for C8000 serial ports

2013-07-31 23:42:32 +02:00

powerpc

powerpc/tm: Fix context switching TAR, PPR and DSCR SPRs

2013-08-09 18:07:12 +10:00

s390

s390: Fix broken build

2013-08-16 21:16:37 -07:00

score

arch: *: Kconfig: add "kernel/Kconfig.freezer" to "arch/*/Kconfig"

2013-08-13 17:57:49 -07:00

sh

SolutionEngine7724: fix typo in Ether platform data

2013-08-22 14:32:18 -07:00

sparc

sparc: delete __cpuinit/__CPUINIT usage from all users

2013-07-14 19:36:52 -04:00

tile

tile: support PTP using the tilegx mPIPE (IEEE 1588)

2013-08-01 14:35:51 -07:00

um

Fix TLB gather virtual address range invalidation corner cases

2013-08-16 08:52:46 -07:00

unicore32

reboot: move arch/x86 reboot= handling to generic kernel

2013-07-09 10:33:29 -07:00

x86

x86 get_unmapped_area: Access mmap_legacy_base through mm_struct member

2013-08-22 10:19:35 -07:00

xtensa

xtensa: delete __cpuinit usage from all xtensa files

2013-07-14 19:36:56 -04:00

.gitignore

…

Kconfig

microblaze: fix clone syscall

2013-08-13 17:57:48 -07:00