[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-mips-cvs
Subject:    Merge tag 'v3.12.8' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-
From:       linux-mips () linux-mips ! org
Date:       2014-01-18 4:45:50
Message-ID: S6822997AbaAREpydj0KG/20140118044554Z+4547 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Fri Jan 17 18:40:59 2014 +0100
Commit: 7dd1891606f9273ebe0561b31e516e3b958d947b
Gitweb: http://git.linux-mips.org/g/ralf/linux/7dd1891606f9
Branch: linux-3.12-stable

---

 .../devicetree/bindings/clock/exynos5250-clock.txt |    2 
 Documentation/networking/packet_mmap.txt           |   10 ++
 Makefile                                           |    2 
 arch/arm/boot/dts/exynos5250.dtsi                  |    2 
 arch/arm/kernel/traps.c                            |    8 +
 arch/arm/mach-footbridge/dc21285-timer.c           |    5 +
 arch/arm/mach-shmobile/board-armadillo800eva.c     |    4 -
 arch/arm/mach-shmobile/board-kzm9g.c               |    2 
 arch/arm/mach-shmobile/board-mackerel.c            |    4 -
 arch/arm/mm/flush.c                                |    6 +
 arch/parisc/include/asm/cacheflush.h               |   12 +-
 arch/parisc/include/asm/page.h                     |    5 -
 arch/parisc/kernel/cache.c                         |   35 ------
 arch/x86/include/asm/fpu-internal.h                |   13 +-
 drivers/acpi/battery.c                             |   21 +++-
 drivers/ata/ahci.c                                 |    3 +
 drivers/char/tpm/tpm_ppi.c                         |   15 ++-
 drivers/clk/clk-divider.c                          |    2 
 drivers/clk/samsung/clk-exynos4.c                  |    2 
 drivers/clk/samsung/clk-exynos5250.c               |   14 ++
 drivers/cpufreq/intel_pstate.c                     |    3 -
 drivers/gpu/drm/nouveau/core/subdev/bios/init.c    |    6 +
 drivers/leds/leds-lp5521.c                         |   12 +-
 drivers/leds/leds-lp5523.c                         |   12 +-
 drivers/mfd/rtsx_pcr.c                             |   10 +-
 drivers/net/ethernet/arc/emac_main.c               |    4 -
 drivers/net/ethernet/broadcom/tg3.c                |    3 +
 drivers/net/ethernet/freescale/fec_main.c          |    4 -
 drivers/net/ethernet/ibm/ehea/ehea_main.c          |    2 
 drivers/net/ethernet/sfc/efx.c                     |    8 +
 drivers/net/ethernet/sfc/mcdi.c                    |   39 +++++--
 drivers/net/ethernet/sfc/net_driver.h              |    3 +
 drivers/net/ethernet/sfc/nic.h                     |    2 
 drivers/net/ethernet/sfc/ptp.c                     |   66 ++++++++++-
 drivers/net/ethernet/sfc/rx.c                      |    6 +
 drivers/net/ethernet/tehuti/tehuti.c               |    1 
 drivers/net/ethernet/xilinx/ll_temac_main.c        |    2 
 drivers/net/ethernet/xilinx/xilinx_axienet_main.c  |    2 
 drivers/net/hamradio/hdlcdrv.c                     |    2 
 drivers/net/hamradio/yam.c                         |    1 
 drivers/net/hyperv/netvsc_drv.c                    |    1 
 drivers/net/macvtap.c                              |   23 +---
 drivers/net/tun.c                                  |   18 ++-
 drivers/net/virtio_net.c                           |  119 ++++++++++++++------
 drivers/net/vxlan.c                                |    2 
 drivers/scsi/sd.c                                  |    5 +
 include/linux/net.h                                |    2 
 include/linux/netdevice.h                          |   22 ++++
 include/linux/skbuff.h                             |    5 +
 kernel/sched/core.c                                |    9 +-
 kernel/sched/fair.c                                |   48 ++++++--
 kernel/sched/sched.h                               |    3 -
 net/8021q/vlan_dev.c                               |   19 +++
 net/bridge/br_multicast.c                          |    4 -
 net/bridge/br_private.h                            |   10 ++
 net/bridge/br_stp_bpdu.c                           |    2 
 net/core/drop_monitor.c                            |    1 
 net/core/neighbour.c                               |    2 
 net/core/netpoll.c                                 |   11 ++
 net/core/skbuff.c                                  |    1 
 net/core/sock.c                                    |    2 
 net/ipv4/fib_rules.c                               |    5 +
 net/ipv4/gre_offload.c                             |   11 +-
 net/ipv4/inet_diag.c                               |   16 +++
 net/ipv4/ip_gre.c                                  |    1 
 net/ipv4/udp.c                                     |    6 +
 net/ipv4/udp_offload.c                             |   37 +++---
 net/ipv6/fib6_rules.c                              |    6 +
 net/ipv6/route.c                                   |   34 ++----
 net/ipv6/udp_offload.c                             |    2 
 net/llc/af_llc.c                                   |    5 +
 net/mac80211/tx.c                                  |   23 ++--
 net/netfilter/nf_conntrack_seqadj.c                |    4 -
 net/netfilter/nf_nat_irc.c                         |   32 +++++
 net/packet/af_packet.c                             |   65 +++++++----
 net/rds/ib.c                                       |    3 -
 net/rds/ib_send.c                                  |    5 -
 net/rose/af_rose.c                                 |   16 +--
 net/unix/af_unix.c                                 |   16 ++-
 79 files changed, 624 insertions(+), 327 deletions(-)

[prev in list] [next in list] [prev in thread] [next in thread]