[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:       2008-12-16 10:46:08
Message-ID: S24205665AbYLPKqM/20081216104612Z+1263 () ftp ! linux-mips ! org
[Download RAW message or body]

Author: Ralf Baechle <ralf@linux-mips.org> Tue Dec 16 01:53:20 2008 +0000
Commit: 899eeeacef351c9a23b679dd672598687096d510
Gitweb: http://www.linux-mips.org/g/linux/899eeeac
Branch: master

---

 Documentation/arm/mem_alignment        |    2 
 MAINTAINERS                            |    8 +-
 arch/arm/common/sa1111.c               |    2 
 arch/arm/kernel/armksyms.c             |    4 -
 arch/arm/kernel/traps.c                |    1 
 arch/arm/mach-pxa/include/mach/reset.h |    5 -
 arch/arm/mm/fault.c                    |    1 
 arch/ia64/hp/sim/Kconfig               |    1 
 arch/powerpc/kernel/misc_32.S          |    3 +
 arch/x86/include/asm/vmi.h             |    8 ++
 arch/x86/kernel/setup.c                |   12 +--
 arch/x86/kernel/smpboot.c              |    2 
 arch/x86/kernel/vmi_32.c               |   16 ++--
 drivers/acpi/toshiba_acpi.c            |   54 ++++++------
 drivers/net/e1000e/ich8lan.c           |    9 ++
 drivers/net/sungem.c                   |  144 ++++++++++++++++++++------------
 drivers/pcmcia/bfin_cf_pcmcia.c        |    2 
 include/linux/netdevice.h              |    7 ++
 include/linux/smp.h                    |    2 
 kernel/cgroup.c                        |    2 
 kernel/sched_clock.c                   |    6 +
 mm/slob.c                              |    2 
 net/core/netpoll.c                     |    2 
 net/ipv4/netfilter/nf_nat_rule.c       |    2 
 net/ipv4/tcp_vegas.c                   |   80 ++----------------
 net/ipv6/ndisc.c                       |    7 +-
 net/netlabel/netlabel_unlabeled.c      |   38 ++++----
 net/phonet/pep-gprs.c                  |   27 +++++-
 net/sched/sch_netem.c                  |    3 -
 29 files changed, 239 insertions(+), 213 deletions(-)

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