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

List:       linux-mips-cvs
Subject:    Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
From:       linux-mips () linux-mips ! org
Date:       2013-04-18 16:03:03
Message-ID: S6826581Ab3DRQDGQ5V0g/20130418160306Z+1824 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Thu Apr 18 17:53:16 2013 +0200
Commit: 6a6fa670e9222ca5134ff8411b5727a1451de985
Gitweb: http://git.linux-mips.org/g/ralf/linux/6a6fa670e922
Branch: master

---

 arch/arm/kvm/coproc.c                             |    4 +-
 arch/avr32/include/asm/io.h                       |    4 ++
 arch/s390/include/asm/io.h                        |    4 --
 arch/s390/include/asm/pgtable.h                   |    4 ++
 drivers/block/rbd.c                               |    3 +-
 drivers/idle/intel_idle.c                         |    1 +
 drivers/net/bonding/bond_main.c                   |   14 ++++++-
 drivers/net/can/mcp251x.c                         |   10 ++++-
 drivers/net/can/sja1000/sja1000_of_platform.c     |   31 ++++++++--------
 drivers/net/ethernet/emulex/benet/be_main.c       |    5 ++-
 drivers/net/ethernet/freescale/fec.c              |    1 +
 drivers/net/ethernet/marvell/Kconfig              |    2 +
 drivers/net/ethernet/marvell/mvneta.c             |    9 ++---
 drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c |    4 +-
 drivers/net/ethernet/stmicro/stmmac/mmc_core.c    |    1 +
 drivers/net/ethernet/ti/cpsw.c                    |    2 +
 drivers/net/tun.c                                 |    2 +
 drivers/net/usb/cdc_mbim.c                        |    2 +
 drivers/platform/x86/thinkpad_acpi.c              |   10 -----
 drivers/video/mmp/core.c                          |    2 -
 fs/binfmt_elf.c                                   |    1 +
 fs/hfsplus/extents.c                              |    2 +
 fs/hugetlbfs/inode.c                              |    2 +
 include/linux/netfilter/ipset/ip_set_ahash.h      |   30 ++++++++++++----
 include/net/addrconf.h                            |    1 +
 kernel/signal.c                                   |    2 +
 mm/hugetlb.c                                      |   12 ++++++
 mm/vmscan.c                                       |    2 +
 net/802/mrp.c                                     |    4 ++
 net/bridge/br_if.c                                |    3 +-
 net/bridge/br_private.h                           |    1 +
 net/bridge/br_stp_if.c                            |    1 +
 net/ipv4/esp4.c                                   |    6 ++-
 net/ipv4/ip_fragment.c                            |   14 +++++--
 net/ipv4/syncookies.c                             |    4 +-
 net/ipv4/tcp_output.c                             |    8 +++-
 net/ipv6/addrconf.c                               |   24 ++-----------
 net/ipv6/addrconf_core.c                          |   19 ++++++++++
 net/ipv6/reassembly.c                             |   12 +++++-
 net/netfilter/ipset/ip_set_hash_ipportnet.c       |   18 +++++++++
 net/netfilter/ipset/ip_set_hash_net.c             |   22 +++++++++++-
 net/netfilter/ipset/ip_set_hash_netiface.c        |   22 +++++++++++-
 net/netfilter/ipset/ip_set_hash_netport.c         |   18 +++++++++
 net/netfilter/ipset/ip_set_list_set.c             |   10 ++++-
 net/netfilter/nf_conntrack_sip.c                  |    6 +--
 net/netfilter/nf_nat_core.c                       |   40 ++++-----------------
 scripts/checkpatch.pl                             |    1 +
 tools/power/x86/turbostat/turbostat.c             |    5 ++-
 48 files changed, 261 insertions(+), 144 deletions(-)

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