diff options
| author | David S. Miller <davem@davemloft.net> | 2015-09-27 01:08:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-09-27 01:08:27 +0200 |
| commit | 4963ed48f2c20196d51a447ee87dc2815584fee4 (patch) | |
| tree | a1902f466dafa00453889a4f1e66b00249ce0529 /arch/arm/mach-s3c24xx/mach-smdk2443.c | |
| parent | Merge branch 'listener-sock-const' (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-4963ed48f2c20196d51a447ee87dc2815584fee4.tar.xz linux-4963ed48f2c20196d51a447ee87dc2815584fee4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/arp.c
The net/ipv4/arp.c conflict was one commit adding a new
local variable while another commit was deleting one.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-smdk2443.c')
0 files changed, 0 insertions, 0 deletions