1. 25 Oct, 2010 32 commits
  2. 24 Oct, 2010 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 229aebb8
      Linus Torvalds authored
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        Update broken web addresses in arch directory.
        Update broken web addresses in the kernel.
        Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
        Revert "Fix typo: configuation => configuration" partially
        ida: document IDA_BITMAP_LONGS calculation
        ext2: fix a typo on comment in ext2/inode.c
        drivers/scsi: Remove unnecessary casts of private_data
        drivers/s390: Remove unnecessary casts of private_data
        net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
        drivers/infiniband: Remove unnecessary casts of private_data
        drivers/gpu/drm: Remove unnecessary casts of private_data
        kernel/pm_qos_params.c: Remove unnecessary casts of private_data
        fs/ecryptfs: Remove unnecessary casts of private_data
        fs/seq_file.c: Remove unnecessary casts of private_data
        arm: uengine.c: remove C99 comments
        arm: scoop.c: remove C99 comments
        Fix typo configue => configure in comments
        Fix typo: configuation => configuration
        Fix typo interrest[ing|ed] => interest[ing|ed]
        Fix various typos of valid in comments
        ...
      
      Fix up trivial conflicts in:
      	drivers/char/ipmi/ipmi_si_intf.c
      	drivers/usb/gadget/rndis.c
      	net/irda/irnet/irnet_ppp.c
      229aebb8
    • Linus Torvalds's avatar
      Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac · 8de547e1
      Linus Torvalds authored
      * 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/edac: (25 commits)
        i7300_edac: Properly initialize per-csrow memory size
        V4L/DVB: i7300_edac: better initialize page counts
        MAINTAINERS: Add maintainer for i7300-edac driver
        i7300-edac: CodingStyle cleanup
        i7300_edac: Improve comments
        i7300_edac: Cleanup: reorganize the file contents
        i7300_edac: Properly detect channel on CE errors
        i7300_edac: enrich FBD error info for corrected errors
        i7300_edac: enrich FBD error info for fatal errors
        i7300_edac: pre-allocate a buffer used to prepare err messages
        i7300_edac: Fix MTR x4/x8 detection logic
        i7300_edac: Make the debug messages coherent with the others
        i7300_edac: Cleanup: remove get_error_info logic
        i7300_edac: Add a code to cleanup error registers
        i7300_edac: Add support for reporting FBD errors
        i7300_edac: Properly detect the type of error correction
        i7300_edac: Detect if the device is on single mode
        i7300_edac: Adds detection for enhanced scrub mode on x8
        i7300_edac: Clear the error bit after reading
        i7300_edac: Add error detection code for global errors
        ...
      8de547e1
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6 · 76c39e4f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/slab-2.6: (27 commits)
        SLUB: Fix memory hotplug with !NUMA
        slub: Move functions to reduce #ifdefs
        slub: Enable sysfs support for !CONFIG_SLUB_DEBUG
        SLUB: Optimize slab_free() debug check
        slub: Move NUMA-related functions under CONFIG_NUMA
        slub: Add lock release annotation
        slub: Fix signedness warnings
        slub: extract common code to remove objects from partial list without locking
        SLUB: Pass active and inactive redzone flags instead of boolean to debug functions
        slub: reduce differences between SMP and NUMA
        Revert "Slub: UP bandaid"
        percpu: clear memory allocated with the km allocator
        percpu: use percpu allocator on UP too
        percpu: reduce PCPU_MIN_UNIT_SIZE to 32k
        vmalloc: pcpu_get/free_vm_areas() aren't needed on UP
        SLUB: Fix merged slab cache names
        Slub: UP bandaid
        slub: fix SLUB_RESILIENCY_TEST for dynamic kmalloc caches
        slub: Fix up missing kmalloc_cache -> kmem_cache_node case for memoryhotplug
        slub: Add dummy functions for the !SLUB_DEBUG case
        ...
      76c39e4f
    • Linus Torvalds's avatar
      Merge branch 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 1765a1fe
      Linus Torvalds authored
      * 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (321 commits)
        KVM: Drop CONFIG_DMAR dependency around kvm_iommu_map_pages
        KVM: Fix signature of kvm_iommu_map_pages stub
        KVM: MCE: Send SRAR SIGBUS directly
        KVM: MCE: Add MCG_SER_P into KVM_MCE_CAP_SUPPORTED
        KVM: fix typo in copyright notice
        KVM: Disable interrupts around get_kernel_ns()
        KVM: MMU: Avoid sign extension in mmu_alloc_direct_roots() pae root address
        KVM: MMU: move access code parsing to FNAME(walk_addr) function
        KVM: MMU: audit: check whether have unsync sps after root sync
        KVM: MMU: audit: introduce audit_printk to cleanup audit code
        KVM: MMU: audit: unregister audit tracepoints before module unloaded
        KVM: MMU: audit: fix vcpu's spte walking
        KVM: MMU: set access bit for direct mapping
        KVM: MMU: cleanup for error mask set while walk guest page table
        KVM: MMU: update 'root_hpa' out of loop in PAE shadow path
        KVM: x86 emulator: Eliminate compilation warning in x86_decode_insn()
        KVM: x86: Fix constant type in kvm_get_time_scale
        KVM: VMX: Add AX to list of registers clobbered by guest switch
        KVM guest: Move a printk that's using the clock before it's ready
        KVM: x86: TSC catchup mode
        ...
      1765a1fe
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · bdaf12b4
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c-viapro: Don't log nacks
        i2c/pca954x: Remove __devinit and __devexit from probe and remove functions
        MAINTAINERS: Add maintainer for PCA9541 I2C bus master selector driver
        i2c/mux: Driver for PCA9541 I2C Master Selector
        i2c: Optimize function i2c_detect()
        i2c: Discard warning message on device instantiation from user-space
        i2c-amd8111: Add proper error handling
        i2c: Change to new flag variable
        i2c: Remove unneeded inclusions of <linux/i2c-id.h>
        i2c: Let i2c_parent_is_i2c_adapter return the parent adapter
        i2c: Simplify i2c_parent_is_i2c_adapter
        i2c-pca-platform: Change device name of request_irq
        i2c: Fix Kconfig dependencies
      bdaf12b4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 7c024e95
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (47 commits)
        HID: fix mismerge in hid-lg
        HID: hidraw: fix window in hidraw_release
        HID: hid-sony: override usbhid_output_raw_report for Sixaxis
        HID: add absolute axis resolution calculation
        HID: force feedback support for Logitech RumblePad gamepad
        HID: support STmicroelectronics and Sitronix with hid-stantuml driver
        HID: magicmouse: Adjust major / minor axes to scale
        HID: Fix for problems with eGalax/DWAV multi-touch-screen
        HID: waltop: add support for Waltop Slim Tablet 12.1 inch
        HID: add NOGET quirk for AXIS 295 Video Surveillance Joystick
        HID: usbhid: remove unused hiddev_driver
        HID: magicmouse: Use hid-input parsing rather than bypassing it
        HID: trivial formatting fix
        HID: Add support for Logitech Speed Force Wireless gaming wheel
        HID: don't Send Feature Reports on Interrupt Endpoint
        HID: 3m: Adjust major / minor axes to scale
        HID: 3m: Correct touchscreen emulation
        HID: 3m: Convert to MT slots
        HID: 3m: Output proper orientation range
        HID: 3m: Adjust to sequential MT HID protocol
        ...
      7c024e95
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 188e213d
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: Makefile - replace the use of <module>-objs with <module>-y
        crypto: hifn_795x - use cancel_delayed_work_sync()
        crypto: talitos - sparse check endian fixes
        crypto: talitos - fix checkpatch warning
        crypto: talitos - fix warning: 'alg' may be used uninitialized in this function
        crypto: cryptd - Adding the AEAD interface type support to cryptd
        crypto: n2_crypto - Niagara2 driver needs to depend upon CRYPTO_DES
        crypto: Kconfig - update broken web addresses
        crypto: omap-sham - Adjust DMA parameters
        crypto: fips - FIPS requires algorithm self-tests
        crypto: omap-aes - OMAP2/3 AES hw accelerator driver
        crypto: updates to enable omap aes
        padata: add missing __percpu markup in include/linux/padata.h
        MAINTAINERS: Add maintainer entries for padata/pcrypt
      188e213d
    • Pekka Enberg's avatar
      Merge branch 'master' into for-linus · 6d4121f6
      Pekka Enberg authored
      Conflicts:
      	include/linux/percpu.h
      	mm/percpu.c
      6d4121f6