1. 17 Sep, 2009 5 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 79b520e8
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (39 commits)
        xfs: includecheck fix for fs/xfs/xfs_iops.c
        xfs: switch to seq_file
        xfs: Record new maintainer information
        xfs: use correct log reservation when handling ENOSPC in xfs_create
        xfs: xfs_showargs() reports group *and* project quotas enabled
        xfs: un-static xfs_inobt_lookup
        xfs: actually enable the swapext compat handler
        xfs: simplify xfs_trans_iget
        xfs: merge fsync and O_SYNC handling
        xfs: speed up free inode search
        xfs: rationalize xfs_inobt_lookup*
        xfs: untangle xfs_dialloc
        xfs: factor out debug checks from xfs_dialloc and xfs_difree
        xfs: improve xfs_inobt_update prototype
        xfs: improve xfs_inobt_get_rec prototype
        xfs: factor out inode initialisation
        fs/xfs: Correct redundant test
        xfs: remove XFS_INO64_OFFSET
        un-static xfs_read_agf
        xfs: add more statics & drop some unused functions
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · abf5940d
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (75 commits)
        Blackfin: update ftrace for latest toolchain
        Blackfin: fix elf_fpregset_t definition
        Blackfin: unify cache init functions
        Blackfin: swap clocksource ratings for gptimer/cycles
        Blackfin: update ftrace_push_return_trace() breakage
        Blackfin: update cm board resources
        Blackfin: cm-bf537u: split board from cm-bf537e
        Blackfin: bf538-ezkit: add SPI IRQ resources
        Blackfin: increase default async timings for parallel flashes
        Blackfin: add ICPLB coverage for async banks
        Blackfin: use KERN_ALERT in all kgdb_test output
        Blackfin: fix BF54x SPI CS resources
        Blackfin: fix typo in isram_write()
        Blackfin: bf537-stamp: add adp5588 gpio resources
        Blackfin: add some isram-driver self tests
        Blackfin: workaround anomaly 05000283
        Blackfin: fix spelling in a few comments
        Blackfin: use raw_smp_processor_id() in exception code
        Blackfin: remove useless duplicated assignment in gpio code
        Blackfin: Fix link errors with binutils 2.19 and GCC 4.3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 66bc4a6f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: (53 commits)
        m68knommu: Make PAGE_SIZE available to assembly files.
        m68knommu: fix ColdFire definition of CLOCK_TICK_RATE
        m68knommu: set multi-function pins for ethernet when enabled
        m68knommu: remove special interrupt handling code for ne2k support
        m68knommu: relax IO_SPACE_LIMIT setting
        m68knommu: remove ColdFire direct interrupt register access
        m68knommu: create a speciailized ColdFire 5272 interrupt controller
        m68knommu: add support for second interrupt controller of ColdFire 5249
        m68knommu: clean up old ColdFire timer irq setup
        m68knommu: map ColdFire interrupts to correct masking bits
        m68knommu: clean up ColdFire 532x CPU timer setup
        m68knommu: simplify ColdFire "timers" clock initialization
        m68knommu: support code to mask external interrupts on old ColdFire CPU's
        m68knommu: merge old ColdFire interrupt controller masking macros
        m68knommu: remove duplicate ColdFire mcf_autovector() code
        m68knommu: move ColdFire INTC definitions to new include file
        m68knommu: mask off all interrupts in ColdFire intc-simr controller
        m68knommu: remove timer device interrupt setup for ColdFire 532x
        m68knommu: remove interrupt masking from ColdFire pit timer
        m68knommu: remove unecessary interrupt level setting in ColdFire 520x setup
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 96c015b7
      Linus Torvalds authored
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (lm85) Don't bind to Winbond/Nuvoton WPCD377I
        hwmon: (pcf8591) Documentation clean-ups
        hwmon: Clearly mark ACPI drivers as such
        hwmon: Use resource_size
        hwmon: Include <linux/io.h> instead of <asm/io.h>
        hwmon: (tmp421) Add documentation
        hwmon: Add driver for Texas Instruments TMP421/422/423 sensor chips
        hwmon-vid: Ignore 6th VID pin of AMD family 0Fh processors
        hwmon: (asus_atk0110) Add maintainer information
        hwmon: (abituguru3) Support multiple DMI strings per chip ID
    • Linus Torvalds's avatar
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · 3aee0605
      Linus Torvalds authored
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
        uwb: avoid radio controller reset loops
        uwb: stop uwbd thread if rc->start() fails
        uwb: handle radio controller events with out-of-range IDs correctly
  2. 16 Sep, 2009 35 commits