1. 10 Jan, 2011 11 commits
  2. 09 Jan, 2011 19 commits
  3. 07 Jan, 2011 10 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus · 0c21e3aa
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hch/hfsplus:
        hfsplus: %L-to-%ll, macro correction, and remove unneeded braces
        hfsplus: spaces/indentation clean-up
        hfsplus: C99 comments clean-up
        hfsplus: over 80 character lines clean-up
        hfsplus: fix an artifact in ioctl flag checking
        hfsplus: flush disk caches in sync and fsync
        hfsplus: optimize fsync
        hfsplus: split up inode flags
        hfsplus: write up fsync for directories
        hfsplus: simplify fsync
        hfsplus: avoid useless work in hfsplus_sync_fs
        hfsplus: make sure sync writes out all metadata
        hfsplus: use raw bio access for partition tables
        hfsplus: use raw bio access for the volume headers
        hfsplus: always use hfsplus_sync_fs to write the volume header
        hfsplus: silence a few debug printks
        hfsplus: fix option parsing during remount
      
      Fix up conflicts due to VFS changes in fs/hfsplus/{hfsplus_fs.h,unicode.c}
      0c21e3aa
    • Linus Torvalds's avatar
      Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6 · 021db8e2
      Linus Torvalds authored
      * 'next-spi' of git://git.secretlab.ca/git/linux-2.6: (77 commits)
        spi/omap: Fix DMA API usage in OMAP MCSPI driver
        spi/imx: correct the test on platform_get_irq() return value
        spi/topcliff: Typo fix threhold to threshold
        spi/dw_spi Typo change diable to disable.
        spi/fsl_espi: change the read behaviour of the SPIRF
        spi/mpc52xx-psc-spi: move probe/remove to proper sections
        spi/dw_spi: add DMA support
        spi/dw_spi: change to EXPORT_SYMBOL_GPL for exported APIs
        spi/dw_spi: Fix too short timeout in spi polling loop
        spi/pl022: convert running variable
        spi/pl022: convert busy flag to a bool
        spi/pl022: pass the returned sglen to the DMA engine
        spi/pl022: map the buffers on the DMA engine
        spi/topcliff_pch: Fix data transfer issue
        spi/imx: remove autodetection
        spi/pxa2xx: pass of_node to spi device and set a parent device
        spi/pxa2xx: Modify RX-Tresh instead of busy-loop for the remaining RX bytes.
        spi/pxa2xx: Add chipselect support for Sodaville
        spi/pxa2xx: Consider CE4100's FIFO depth
        spi/pxa2xx: Add CE4100 support
        ...
      021db8e2
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 72eb6a79
      Linus Torvalds authored
      * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu: (30 commits)
        gameport: use this_cpu_read instead of lookup
        x86: udelay: Use this_cpu_read to avoid address calculation
        x86: Use this_cpu_inc_return for nmi counter
        x86: Replace uses of current_cpu_data with this_cpu ops
        x86: Use this_cpu_ops to optimize code
        vmstat: User per cpu atomics to avoid interrupt disable / enable
        irq_work: Use per cpu atomics instead of regular atomics
        cpuops: Use cmpxchg for xchg to avoid lock semantics
        x86: this_cpu_cmpxchg and this_cpu_xchg operations
        percpu: Generic this_cpu_cmpxchg() and this_cpu_xchg support
        percpu,x86: relocate this_cpu_add_return() and friends
        connector: Use this_cpu operations
        xen: Use this_cpu_inc_return
        taskstats: Use this_cpu_ops
        random: Use this_cpu_inc_return
        fs: Use this_cpu_inc_return in buffer.c
        highmem: Use this_cpu_xx_return() operations
        vmstat: Use this_cpu_inc_return for vm statistics
        x86: Support for this_cpu_add, sub, dec, inc_return
        percpu: Generic support for this_cpu_add, sub, dec, inc_return
        ...
      
      Fixed up conflicts: in arch/x86/kernel/{apic/nmi.c, apic/x2apic_uv_x.c, process.c}
      as per Tejun.
      72eb6a79
    • Linus Torvalds's avatar
      Merge branch 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 23d69b09
      Linus Torvalds authored
      * 'for-2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq: (33 commits)
        usb: don't use flush_scheduled_work()
        speedtch: don't abuse struct delayed_work
        media/video: don't use flush_scheduled_work()
        media/video: explicitly flush request_module work
        ioc4: use static work_struct for ioc4_load_modules()
        init: don't call flush_scheduled_work() from do_initcalls()
        s390: don't use flush_scheduled_work()
        rtc: don't use flush_scheduled_work()
        mmc: update workqueue usages
        mfd: update workqueue usages
        dvb: don't use flush_scheduled_work()
        leds-wm8350: don't use flush_scheduled_work()
        mISDN: don't use flush_scheduled_work()
        macintosh/ams: don't use flush_scheduled_work()
        vmwgfx: don't use flush_scheduled_work()
        tpm: don't use flush_scheduled_work()
        sonypi: don't use flush_scheduled_work()
        hvsi: don't use flush_scheduled_work()
        xen: don't use flush_scheduled_work()
        gdrom: don't use flush_scheduled_work()
        ...
      
      Fixed up trivial conflict in drivers/media/video/bt8xx/bttv-input.c
      as per Tejun.
      23d69b09
    • Linus Torvalds's avatar
      Merge branch 'sched-fixes-for-linus' of... · e744070f
      Linus Torvalds authored
      Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        sched: Constify function scope static struct sched_param usage
        sched: Fix strncmp operation
        sched: Move sched_autogroup_exit() to free_signal_struct()
        sched: Fix struct autogroup memory leak
        sched: Mark autogroup_init() __init
        sched: Consolidate the name of root_task_group and init_task_group
      e744070f
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-cleanups-for-linus' of... · d004e4d3
      Linus Torvalds authored
      Merge branch 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        x86: apic: Cleanup and simplify setup_local_APIC()
        x86: Further simplify mp_irq info handling
        x86: Unify 3 similar ways of saving mp_irqs info
        x86, ioapic: Avoid writing io_apic id if already correct
        x86, x2apic: Don't map lapic addr for preenabled x2apic systems
        x86, sfi: Use register_lapic_address()
        x86, apic: Use register_lapic_address() in init_apic_mapping()
        x86, apic: Remove early_init_lapic_mapping()
        x86, apic: Unify identical register_lapic_address() functions
      d004e4d3
    • Linus Torvalds's avatar
      Merge branch 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 128283a4
      Linus Torvalds authored
      * 'mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, MCE: Fix NB error formatting
        EDAC, MCE: Use BIT_64() to eliminate warnings on 32-bit
        EDAC, MCE: Enable MCE decoding on F15h
        EDAC, MCE: Allow F15h bank 6 MCE injection
        EDAC, MCE: Shorten error report formatting
        EDAC, MCE: Overhaul error fields extraction macros
        EDAC, MCE: Add F15h FP MCE decoder
        EDAC, MCE: Add F15 EX MCE decoder
        EDAC, MCE: Add an F15h NB MCE decoder
        EDAC, MCE: No F15h LS MCE decoder
        EDAC, MCE: Add F15h CU MCE decoder
        EDAC, MCE: Add F15h IC MCE decoder
        EDAC, MCE: Add F15h DC MCE decoder
        EDAC, MCE: Select extended error code mask
      128283a4
    • Linus Torvalds's avatar
      Merge branch 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 442d1ba2
      Linus Torvalds authored
      * 'edac-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        amd64_edac: Disable DRAM ECC injection on K8
        EDAC: Fixup scrubrate manipulation
        amd64_edac: Remove two-stage initialization
        amd64_edac: Check ECC capabilities initially
        amd64_edac: Carve out ECC-related hw settings
        amd64_edac: Remove PCI ECS enabling functions
        amd64_edac: Remove explicit Kconfig PCI dependency
        amd64_edac: Allocate driver instances dynamically
        amd64_edac: Rework printk macros
        amd64_edac: Rename CPU PCI devices
        amd64_edac: Concentrate per-family init even more
        amd64_edac: Cleanup the CPU PCI device reservation
        amd64_edac: Simplify CPU family detection
        amd64_edac: Add per-family init function
        amd64_edac: Use cached extended CPU model
        amd64_edac: Remove F11h support
      442d1ba2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · fb5131e1
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (65 commits)
        [S390] prevent unneccesary loops_per_jiffy recalculation
        [S390] cpuinfo: use get_online_cpus() instead of preempt_disable()
        [S390] smp: remove cpu hotplug messages
        [S390] mutex: enable spinning mutex on s390
        [S390] mutex: Introduce arch_mutex_cpu_relax()
        [S390] cio: fix ccwgroup unregistration race condition
        [S390] perf: add DWARF register lookup for s390
        [S390] cleanup ftrace backend functions
        [S390] ptrace cleanup
        [S390] smp/idle: call init_idle() before starting a new cpu
        [S390] smp: delay idle task creation
        [S390] dasd: Correct retry counter for terminated I/O.
        [S390] dasd: Add support for raw ECKD access.
        [S390] dasd: Prevent deadlock during suspend/resume.
        [S390] dasd: Improve handling of stolen DASD reservation
        [S390] dasd: do path verification for paths added at runtime
        [S390] dasd: add High Performance FICON multitrack support
        [S390] cio: reduce memory consumption of itcw structures
        [S390] nmi: enable machine checks early
        [S390] qeth: buffer count imbalance
        ...
      fb5131e1
    • Linus Torvalds's avatar
      Merge branch 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6 · d074b104
      Linus Torvalds authored
      * 'rmobile-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (67 commits)
        ARM: mach-shmobile: update for SMP changes.
        ARM: mach-shmobile: update for GIC changes.
        ARM: mach-shmobile: Fix up clkdev fallout for SH73A0.
        dma: shdma: don't register the global die notifier multiple times
        ARM: mach-shmobile: Rely on run-time IRQ handlers
        ARM: mach-shmobile: Run-time IRQ handler for GIC
        ARM: mach-shmobile: Run-time IRQ handler for INTCA
        ARM: mach-shmobile: Enable CONFIG_MULTI_IRQ_HANDLER
        ARM: mach-shmobile: Use shared GIC entry macros
        ARM: mach-shmobile: mackerel: Add zboot support
        ARM: mach-shmobile: mackerel: Add HDMI sound support
        ARM: mach-shmobile: mackerel: add HDMI video support
        ARM: mach-shmobile: ap4evb: fixup clk_put timing of fsib_clk
        ARM: mach-shmobile: sh73a0: fix div4 table
        ARM: mach-shmobile: ap4/mackerel: modify wrong comment out of USB
        ARM: mach-shmobile: Mackerel VGA camera support
        mmc: sh_mmcif: make DMA support by the driver unconditional
        ARM: mach-shmobile: Add eMMC support through MMCIF on AG5EVM
        ARM: mach-shmobile: Use pullups for AG5EVM KEYSC pins
        ARM: mach-shmobile: sh73a0 GPIO pullup improvement
        ...
      d074b104