[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-2.6
From:       linux-mips () linux-mips ! org
Date:       2010-07-28 15:36:12
Message-ID: S1492751Ab0G1PgQ/20100728153616Z+715 () eddie ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Wed Jul 28 16:33:55 2010 +0100
Commit: 1c970104f1062c1213ab7032cdaff9b8f97fadb7
Gitweb: http://git.linux-mips.org/g/linux/1c970104
Branch: master

---

 arch/powerpc/kernel/perf_event_fsl_emb.c |    6 ++--
 drivers/edac/mpc85xx_edac.c              |    3 ++
 drivers/gpio/gpiolib.c                   |    7 +++--
 drivers/net/bnx2x.h                      |    4 +++
 drivers/net/bnx2x_main.c                 |   42 +++++++++++++++++++----------
 drivers/net/bonding/bond_alb.c           |    2 +
 drivers/net/igb/igb_main.c               |    9 ++++++
 drivers/net/ixgbe/ixgbe_main.c           |    9 ++++++
 drivers/net/macvlan.c                    |   10 ++++++-
 drivers/net/macvtap.c                    |   18 +++++++++++--
 drivers/net/s2io.h                       |    2 +
 drivers/net/tun.c                        |   14 ++++++++--
 drivers/net/wimax/i2400m/i2400m-usb.h    |    1 +
 drivers/net/wimax/i2400m/usb.c           |    2 +
 drivers/net/wireless/ath/ath9k/recv.c    |    4 +--
 drivers/power/ds2782_battery.c           |   29 ++++++++++----------
 drivers/rtc/rtc-rx8581.c                 |   20 ++++++++++++--
 fs/9p/vfs_dir.c                          |    2 +
 include/linux/if_macvlan.h               |    2 +
 include/net/tc_act/tc_mirred.h           |    1 +
 kernel/module.c                          |    4 ++-
 net/core/dev.c                           |    1 +
 net/core/skbuff.c                        |    7 +++--
 net/ipv6/addrconf.c                      |   14 ++++++----
 net/mac80211/cfg.c                       |    2 +
 net/sched/act_mirred.c                   |   43 ++++++++++++++++++++++++++++--
 26 files changed, 196 insertions(+), 62 deletions(-)

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