26 Sep, 2006

2 commits

  • This adds support for the Atmel AVR32 architecture as well as the AT32AP7000
    CPU and the AT32STK1000 development board.

    AVR32 is a new high-performance 32-bit RISC microprocessor core, designed for
    cost-sensitive embedded applications, with particular emphasis on low power
    consumption and high code density. The AVR32 architecture is not binary
    compatible with earlier 8-bit AVR architectures.

    The AVR32 architecture, including the instruction set, is described by the
    AVR32 Architecture Manual, available from

    http://www.atmel.com/dyn/resources/prod_documents/doc32000.pdf

    The Atmel AT32AP7000 is the first CPU implementing the AVR32 architecture. It
    features a 7-stage pipeline, 16KB instruction and data caches and a full
    Memory Management Unit. It also comes with a large set of integrated
    peripherals, many of which are shared with the AT91 ARM-based controllers from
    Atmel.

    Full data sheet is available from

    http://www.atmel.com/dyn/resources/prod_documents/doc32003.pdf

    while the CPU core implementation including caches and MMU is documented by
    the AVR32 AP Technical Reference, available from

    http://www.atmel.com/dyn/resources/prod_documents/doc32001.pdf

    Information about the AT32STK1000 development board can be found at

    http://www.atmel.com/dyn/products/tools_card.asp?tool_id=3918

    including a BSP CD image with an earlier version of this patch, development
    tools (binaries and source/patches) and a root filesystem image suitable for
    booting from SD card.

    Alternatively, there's a preliminary "getting started" guide available at
    http://avr32linux.org/twiki/bin/view/Main/GettingStarted which provides links
    to the sources and patches you will need in order to set up a cross-compiling
    environment for avr32-linux.

    This patch, as well as the other patches included with the BSP and the
    toolchain patches, is actively supported by Atmel Corporation.

    [dmccr@us.ibm.com: Fix more pxx_page macro locations]
    [bunk@stusta.de: fix `make defconfig']
    Signed-off-by: Haavard Skinnemoen
    Signed-off-by: Adrian Bunk
    Signed-off-by: Dave McCracken
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Haavard Skinnemoen
     
  • Now that all of the supporting pieces of NetLabel have a home at SourceForge
    update the Kconfig help text and add an entry to the MAINTAINERS file.

    Signed-off-by: Paul Moore
    Signed-off-by: David S. Miller

    Paul Moore
     

25 Sep, 2006

1 commit

  • * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
    net/ieee80211: fix more crypto-related build breakage
    [PATCH] Spidernet: add ethtool -S (show statistics)
    [NET] GT96100: Delete bitrotting ethernet driver
    [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
    [PATCH] Cirrus Logic ep93xx ethernet driver
    r8169: the MMIO region of the 8167 stands behin BAR#1
    e1000, ixgb: Remove pointless wrappers
    [PATCH] Remove powerpc specific parts of 3c509 driver
    [PATCH] s2io: Switch to pci_get_device
    [PATCH] gt96100: move to pci_get_device API
    [PATCH] ehea: bugfix for register access functions
    [PATCH] e1000 disable device on PCI error
    drivers/net/phy/fixed: #if 0 some incomplete code
    drivers/net: const-ify ethtool_ops declarations
    [PATCH] ethtool: allow const ethtool_ops
    [PATCH] sky2: big endian
    [PATCH] sky2: fiber support
    [PATCH] sky2: tx pause bug fix
    drivers/net: Trim trailing whitespace
    [PATCH] ehea: IBM eHEA Ethernet Device Driver
    ...

    Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
    drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
    commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
    next to unrelated changes in this update.

    Linus Torvalds
     

24 Sep, 2006

2 commits


23 Sep, 2006

5 commits

  • Conflicts:

    net/ieee80211/ieee80211_crypt_tkip.c
    net/ieee80211/ieee80211_crypt_wep.c

    Jeff Garzik
     
  • Add a driver for the Ammasso 1100 gigabit ethernet RNIC.

    Signed-off-by: Tom Tucker
    Signed-off-by: Steve Wise
    Signed-off-by: Roland Dreier

    Tom Tucker
     
  • Add a driver for IBM GX bus InfiniBand adapters, which are usable with
    some pSeries/System p systems.

    Signed-off-by: Heiko J Schick
    Signed-off-by: Roland Dreier

    Heiko J Schick
     
  • * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: (44 commits)
    [S390] hypfs crashes with invalid mount option.
    [S390] cio: subchannel evaluation function operates without lock
    [S390] cio: always query all paths on path verification.
    [S390] cio: update path groups on logical CHPID changes.
    [S390] cio: subchannels in no-path state.
    [S390] Replace nopav-message on VM.
    [S390] set modalias for ccw bus uevents.
    [S390] Get rid of DBG macro.
    [S390] Use alternative user-copy operations for new hardware.
    [S390] Make user-copy operations run-time configurable.
    [S390] Cleanup in signal handling code.
    [S390] Cleanup in page table related code.
    [S390] Linux API for writing z/VM APPLDATA Monitor records.
    [S390] xpram off by one error.
    [S390] Remove kexec experimental flag.
    [S390] cleanup appldata.
    [S390] fix typo in vmcp.
    [S390] Kernel stack overflow handling.
    [S390] qdio slsb processing state.
    [S390] Missing initialization in common i/o layer.
    ...

    Linus Torvalds
     
  • * git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (114 commits)
    [POWERPC] Fix ohare IDE irq workaround on old powermacs
    [POWERPC] EEH: Power4 systems sometimes need multiple resets.
    [POWERPC] Include in arch/powerpc/sysdev/fsl_soc.h for phys_addr_t.
    [POWERPC] Demacrofy arch/powerpc/platforms/maple/pci.c
    [POWERPC] Maple U3 HT - reject inappropriate config space access
    [POWERPC] Fix IPIC pending register assignments
    [POWERPC] powerpc: fix building gdb against asm/ptrace.h
    [POWERPC] Remove DISCONTIGMEM cruft from page.h
    [POWERPC] Merge iSeries i/o operations with the rest
    [POWERPC] 40x: Fix debug status register defines
    [POWERPC] Fix compile error in sbc8560
    [POWERPC] EEH: support MMIO enable recovery step
    [POWERPC] EEH: enable MMIO/DMA on frozen slot
    [POWERPC] EEH: code comment cleanup
    [POWERPC] EEH: balance pcidev_get/put calls
    [POWERPC] PPC: Fix xmon stack frame address in backtrace
    [POWERPC] Add AT_PLATFORM value for Xilinx Virtex-4 FX
    [POWERPC] Start arch/powerpc/boot code reorganization
    [POWERPC] Define of_read_ulong helper
    [POWERPC] iseries: eliminate a couple of warnings
    ...

    Linus Torvalds
     

20 Sep, 2006

2 commits


18 Sep, 2006

2 commits


13 Sep, 2006

1 commit


11 Sep, 2006

1 commit

  • Signed-off-by: Valerie Henson
    Signed-off-by: Jeff Garzik

    MAINTAINERS | 4 ++--
    drivers/net/tulip/21142.c | 2 +-
    drivers/net/tulip/eeprom.c | 2 +-
    drivers/net/tulip/interrupt.c | 2 +-
    drivers/net/tulip/media.c | 2 +-
    drivers/net/tulip/pnic.c | 2 +-
    drivers/net/tulip/pnic2.c | 2 +-
    drivers/net/tulip/timer.c | 2 +-
    drivers/net/tulip/tulip_core.c | 2 +-
    9 files changed, 10 insertions(+), 10 deletions(-)

    Valerie Henson
     

06 Sep, 2006

1 commit


04 Sep, 2006

1 commit


30 Aug, 2006

4 commits


21 Aug, 2006

1 commit


20 Aug, 2006

1 commit


15 Aug, 2006

1 commit


12 Aug, 2006

1 commit

  • While helping someone to submit a patch to the stable branch, I noticed
    that the stable branch is not listed in the MAINTAINERS file. This was
    after I went there to look for the email addresses for the stable branch
    list (stable@kernel.org).

    This patch adds the stable branch to the maintainers file so that people
    can find where to send patches when they have a fix for the stable team.

    Signed-off-by: Steven Rostedt
    Signed-off-by: Chris Wright
    Signed-off-by: Greg Kroah-Hartman

    Steven Rostedt
     

07 Aug, 2006

2 commits

  • Jeff Garzik
     
  • * master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa:
    [ALSA] Don't reject O_RDWR at opening PCM OSS with read/write-only device
    [ALSA] snd-emu10k1: Implement support for Audigy 2 ZS [SB0353]
    [ALSA] add MAINTAINERS entry for snd-aoa
    [ALSA] aoa: platform function gpio: ignore errors from functions that don't exist
    [ALSA] make snd-powermac load even when it can't bind the device
    [ALSA] aoa: fix toonie codec
    [ALSA] aoa: feature gpio layer: fix IRQ access
    [ALSA] Conversions from kmalloc+memset to k(z|c)alloc
    [ALSA] snd-emu10k1: Fixes ALSA bug#2190

    Linus Torvalds
     

06 Aug, 2006

1 commit

  • While helping someone to submit a patch to the stable branch, I noticed
    that the stable branch is not listed in the MAINTAINERS file. This was
    after I went there to look for the email addresses for the stable branch
    list (stable@kernel.org).

    This patch adds the stable branch to the maintainers file so that people
    can find where to send patches when they have a fix for the stable team.

    Signed-off-by: Steven Rostedt
    Signed-off-by: Chris Wright
    Cc: Greg KH
    Signed-off-by: Andrew Morton
    Signed-off-by: Linus Torvalds

    Steven Rostedt
     

05 Aug, 2006

1 commit


04 Aug, 2006

3 commits


03 Aug, 2006

2 commits


01 Aug, 2006

4 commits


29 Jul, 2006

1 commit