1. 23 11月, 2011 7 次提交
  2. 22 11月, 2011 10 次提交
  3. 21 11月, 2011 4 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6fe4c6d4
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (86 commits)
        ipv4: fix redirect handling
        ping: dont increment ICMP_MIB_INERRORS
        sky2: fix hang in napi_disable
        sky2: enforce minimum ring size
        bonding: Don't allow mode change via sysfs with slaves present
        f_phonet: fix page offset of first received fragment
        stmmac: fix pm functions avoiding sleep on spinlock
        stmmac: remove spin_lock in stmmac_ioctl.
        stmmac: parameters auto-tuning through HW cap reg
        stmmac: fix advertising 1000Base capabilties for non GMII iface
        stmmac: use mdelay on timeout of sw reset
        sky2: version 1.30
        sky2: used fixed RSS key
        sky2: reduce default Tx ring size
        sky2: rename up/down functions
        sky2: pci posting issues
        sky2: fix hang on shutdown (and other irq issues)
        r6040: fix check against MCRO_HASHEN bit in r6040_multicast_list
        MAINTAINERS: change email address for shemminger
        pch_gbe: Move #include of module.h
        ...
      6fe4c6d4
    • L
      Merge branch 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm · a4cc3889
      Linus Torvalds 提交于
      * 'kvm-updates/3.2' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM guest: prevent tracing recursion with kvmclock
        Revert "KVM: PPC: Add support for explicit HIOR setting"
        KVM: VMX: Check for automatic switch msr table overflow
        KVM: VMX: Add support for guest/host-only profiling
        KVM: VMX: add support for switching of PERF_GLOBAL_CTRL
        KVM: s390: announce SYNC_MMU
        KVM: s390: Fix tprot locking
        KVM: s390: handle SIGP sense running intercepts
        KVM: s390: Fix RUNNING flag misinterpretation
      a4cc3889
    • L
      Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm · bb893d15
      Linus Torvalds 提交于
      * 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
        ARM: wire up process_vm_writev and process_vm_readv syscalls
        ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list
        ARM: 7158/1: add new MFP implement for NUC900
        ARM: 7157/1: fix a building WARNING for nuc900
        ARM: 7156/1: l2x0: fix compile error on !CONFIG_USE_OF
        ARM: 7155/1: arch.h: Declare 'pt_regs' locally
        ARM: 7154/1: mach-bcmring: fix build error in dma.c
        ARM: 7153/1: mach-bcmring: fix build error in core.c
        ARM: 7152/1: distclean: Remove generated .dtb files
        ARM: 7150/1: Allow kernel unaligned accesses on ARMv6+ processors
        ARM: 7149/1: spi/pl022: Enable clock in probe
        Revert "ARM: 7098/1: kdump: copy kernel relocation code at the kexec prepare stage"
      bb893d15
    • L
      Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 2d360fcb
      Linus Torvalds 提交于
      * 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM / Suspend: Fix bug in suspend statistics update
        PM / Hibernate: Fix the early termination of test modes
        PM / shmobile: Fix build of sh7372_pm_init() for CONFIG_PM unset
        PM Sleep: Do not extend wakeup paths to devices with ignore_children set
        PM / driver core: disable device's runtime PM during shutdown
        PM / devfreq: correct Kconfig dependency
        PM / devfreq: fix use after free in devfreq_remove_device
        PM / shmobile: Avoid restoring the INTCS state during initialization
        PM / devfreq: Remove compiler error after irq.h update
        PM / QoS: Properly use the WARN() macro in dev_pm_qos_add_request()
        PM / Clocks: Only disable enabled clocks in pm_clk_suspend()
        ARM: mach-shmobile: sh7372 A3SP no_suspend_console fix
        PM / shmobile: Don't skip debugging output in pd_power_up()
      2d360fcb
  4. 20 11月, 2011 2 次提交
  5. 19 11月, 2011 14 次提交
  6. 18 11月, 2011 3 次提交
    • L
      Merge branch 'stable/for-linus-fixes-3.2' of... · b6844523
      Linus Torvalds 提交于
      Merge branch 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen
      
      * 'stable/for-linus-fixes-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/xen:
        xen-gntalloc: signedness bug in add_grefs()
        xen-gntalloc: integer overflow in gntalloc_ioctl_alloc()
        xen-gntdev: integer overflow in gntdev_alloc_map()
        xen:pvhvm: enable PVHVM VCPU placement when using more than 32 CPUs.
        xen/balloon: Avoid OOM when requesting highmem
        xen: Remove hanging references to CONFIG_XEN_PLATFORM_PCI
        xen: map foreign pages for shared rings by updating the PTEs directly
      b6844523
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 15bd1cfb
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.dk/linux-block:
        block: add missed trace_block_plug
        paride: fix potential information leak in pg_read()
        bio: change some signed vars to unsigned
        block: avoid unnecessary plug list flush
        cciss: auto engage SCSI mid layer at driver load time
        loop: cleanup set_status interface
        include/linux/bio.h: use a static inline function for bio_integrity_clone()
        loop: prevent information leak after failed read
        block: Always check length of all iov entries in blk_rq_map_user_iov()
        The Windows driver .inf disables ASPM on all cciss devices. Do the same.
        backing-dev: ensure wakeup_timer is deleted
        block: Revert "[SCSI] genhd: add a new attribute "alias" in gendisk"
      15bd1cfb
    • L
      Merge branch 'unicore32' of git://github.com/gxt/linux · 9545eb61
      Linus Torvalds 提交于
      * 'unicore32' of git://github.com/gxt/linux:
        unicore32, exec: remove redundant set_fs(USER_DS)
        unicore32: Fix typo 'PUV3_I2C'
        unicore32: drop unused Kconfig symbols
        rtc: rtc-puv3: Add __devinit and __devexit markers for probe and remove
        arch/unicore32: do not use EXTRA_AFLAGS or EXTRA_CFLAGS
        unicore32: fix build error for find bitops
      9545eb61