1. 27 Nov, 2007 6 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 · 9ccc2362
      Linus Torvalds authored
      * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
        [S390] cio: Register/unregister subchannels only from kslowcrw.
        [S390] Add missing die_notifier() call to die().
        [S390] Fix memory detection.
        [S390] Explicitly code allocpercpu calls in iucv
        [S390] Dont overwrite lowcores on smp_send_stop().
        [S390] Optimize storage key handling for anonymous pages
        [S390] Fix kernel preemption.
        [S390] appldata: remove unused binary sysctls.
        [S390] cmm: remove unused binary sysctls.
        [S390] Fix irq tracing and lockdep_sys_exit calls.
        [S390] magic sysrq: check for in_atomic before doing an console_unblank
        [S390] cio: change device sense procedure to work with pav aliases
      9ccc2362
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc · da457d4b
      Linus Torvalds authored
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (27 commits)
        [POWERPC] 83xx: Update mpc8349emitx(gp) defconfig for USB
        [POWERPC] 83xx: Update mpc832x_rdb_defconfig to enable MMC-over-SPI
        [POWERPC] 83xx: MPC832x RDB - remove spidev stub, use mmc_spi
        [POWERPC] 8xxx: MDS board RTC fixes
        [POWERPC] Fix 8xx build breakage due to _tlbie changes
        [POWERPC] Fix device tree interrupt map for Freescale ULI1575 boards
        [POWERPC] Fix possible division by zero in scaled time accounting
        [POWERPC] spufs: Fix context destroy vs /spu readdir race
        [POWERPC] Fix RTAS os-term usage on kernel panic
        [POWERPC] 83xx: Handle mpc8360 rev. 2.1 RGMII timing erratum
        [POWERPC] Document rgmii-rxid and rgmii-txid phy-connection-types
        [POWERPC] 83xx: Fix 2nd UCC entry in mpc832x_mds.dts
        [POWERPC] 83xx: mpc832x mds: Fix board PHY reset code
        [POWERPC] Fix potential NULL dereference
        [POWERPC] vdso: Fixes for cache block sizes
        [POWERPC] pasemi: Don't reset mpic at boot
        [POWERPC] Fix kmalloc alignment on non-coherent DMA platforms
        [POWERPC] Fix build failure on legacy iSeries
        [POWERPC] 4xx: Use virtual PVR value to init FPU on arch/ppc 440EP
        [POWERPC] 4xx: UIC add mask_ack callback
        ...
      da457d4b
    • Karsten Keil's avatar
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus · 552d2f84
      Linus Torvalds authored
      * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
        [MIPS] vpe: Add missing "space"
        [MIPS] Compliment va_start() with va_end().
        [MIPS] IP22: Fix broken eeprom access by using __raw_readl/__raw_writel
        [MIPS] IP22: Fix broken EISA interrupt setup by switching to generic i8259
        [MIPS] 64-bit Sibyte kernels need DMA32.
        [MIPS] Only build r4k clocksource for systems that work ok with it.
        [MIPS] Handle R4000/R4400 mfc0 from count register.
        [MIPS] Fix possible hang in LL/SC futex loops.
        [MIPS] Fix context DSP context / TLS pointer switching bug for new threads.
        [MIPS] IP32: More interrupt renumbering fixes.
        [MIPS] time: MIPSsim's plat_time_init doesn't need to be irq safe.
        [MIPS] time: Fix negated condition in cevt-r4k driver.
        [MIPS] Fix pcspeaker build.
      552d2f84
    • Linus Torvalds's avatar
      Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa · 09cfd929
      Linus Torvalds authored
      * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsa:
        [ALSA] version 1.0.15
        [ALSA] emu10k1 - Check value ranges in ctl callbacks
        [ALSA] emu10k1: Add mixer controls parameter checking.
        [ALSA] fix private data pointer calculation in CS4270 driver
        [ALSA] portman2x4 - Fix probe error
        [ALSA] ca0106 - Fix write proc assignment
        [ALSA] s3c2443-ac97: compilation fix
        [ALSA] hda-codec - Revert volume knob controls in STAC codecs
        [ALSA] ca0106 - Check value range in ctl callbacks
        [ALSA] hda-codec - Check PINCAP only for PIN widgets
        [ALSA] mpu401: fix recursive locking in timer
        [ALSA] cmipci: fix FLINKON/OFF bits
        [ALSA] hda-codec - Disable shared stream on AD1986A
      09cfd929
    • Andreas Herrmann's avatar
      x86: correctly set UTS_MACHINE for "make ARCH=x86" · 8c6531f7
      Andreas Herrmann authored
      For a kernel built with "make ARCH=x86" the following system
      information is displayed when running the new kernel
      
          $ uname -m
          x86
      
      On some i386 systems (e.g. K7) we even have the following information
      
          $ uname -m
          x66
      
      This is weird. The usual information for "uname -m" should be "x86_64"
      on 64-bit and "i386" or "i686" on 32-bit.
      
      This patch fixes the issue by setting UTS_MACHINE to "i386" for 32-bit
      kernel builds and to "x86_64" for 64-bit kernel builds. I.e., "x86"
      won't be used for UTS_MACHINE anymore.
      
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Cc: Ingo Molnar <mingo@redhat.com>
      Cc: "H. Peter Anvin" <hpa@zytor.com>
      Acked-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Signed-off-by: default avatarAndreas Herrmann <aherrman@arcor.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8c6531f7
  2. 26 Nov, 2007 13 commits
  3. 20 Nov, 2007 21 commits