OSDN Git Service

Merge tag 'v3.11-rc1' into h8300
authorYoshinori Sato <ysato@users.sourceforge.jp>
Tue, 16 Jul 2013 05:41:06 +0000 (14:41 +0900)
committerYoshinori Sato <ysato@users.sourceforge.jp>
Tue, 16 Jul 2013 05:41:06 +0000 (14:41 +0900)
commitc568d585c1ea5a55c07b2ca47e146f97c9b33c32
treea530e40384c21a99304699d22558303beba5e4cb
parente922f9745d1c91802247e5cebba8dd802489f200
parentad81f0545ef01ea651886dddac4bef6cec930092
Merge tag 'v3.11-rc1' into h8300

Linux 3.11-rc1

Conflicts:
arch/h8300/include/uapi/asm/socket.h
MAINTAINERS
arch/arm/Kconfig
arch/x86/ia32/ia32_aout.c
include/linux/fs.h
include/linux/netdevice.h
include/uapi/linux/Kbuild
kernel/time/tick-broadcast.c
net/core/dev.c
net/core/skbuff.c
net/core/sock.c
net/ipv4/tcp_ipv4.c