1. 26 10月, 2010 33 次提交
  2. 25 10月, 2010 7 次提交
    • L
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · c4a6eb3b
      Linus Torvalds 提交于
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (48 commits)
        [S390] topology: export cpu topology via proc/sysinfo
        [S390] topology: move topology sysinfo code
        [S390] topology: clean up facility detection
        [S390] cleanup facility list handling
        [S390] enable ARCH_DMA_ADDR_T_64BIT with 64BIT
        [S390] dasd: ignore unsolicited interrupts for DIAG
        [S390] kvm: Enable z196 instruction facilities
        [S390] dasd: fix unsolicited interrupt recognition
        [S390] dasd: fix use after free in dbf
        [S390] kvm: Fix badness at include/asm/mmu_context.h:83
        [S390] cio: fix I/O cancel function
        [S390] topology: change default
        [S390] smp: use correct cpu address in print_cpu_info()
        [S390] remove ieee_instruction_pointer from thread_struct
        [S390] cleanup system call parameter setup
        [S390] correct alignment of cpuid structure
        [S390] cleanup lowcore access from external interrupts
        [S390] cleanup lowcore access from program checks
        [S390] pgtable: move pte_mkhuge() from hugetlb.h to pgtable.h
        [S390] fix SIGBUS handling
        ...
      c4a6eb3b
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 · 33081adf
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: (365 commits)
        ALSA: hda - Disable sticky PCM stream assignment for AD codecs
        ALSA: usb - Creative USB X-Fi volume knob support
        ALSA: ca0106: Use card specific dac id for mute controls.
        ALSA: ca0106: Allow different sound cards to use different SPI channel mappings.
        ALSA: ca0106: Create a nice spot for mapping channels to dacs.
        ALSA: ca0106: Move enabling of front dac out of hardcoded setup sequence.
        ALSA: ca0106: Pull out dac powering routine into separate function.
        ALSA: ca0106 - add Sound Blaster 5.1vx info.
        ASoC: tlv320dac33: Use usleep_range for delays
        ALSA: usb-audio: add Novation Launchpad support
        ALSA: hda - Add workarounds for CT-IBG controllers
        ALSA: hda - Fix wrong TLV mute bit for STAC/IDT codecs
        ASoC: tpa6130a2: Error handling for broken chip
        ASoC: max98088: Staticise m98088_eq_band
        ASoC: soc-core: Fix codec->name memory leak
        ALSA: hda - Apply ideapad quirk to Acer laptops with Cxt5066
        ALSA: hda - Add some workarounds for Creative IBG
        ALSA: hda - Fix wrong SPDIF NID assignment for CA0110
        ALSA: hda - Fix codec rename rules for ALC662-compatible codecs
        ALSA: hda - Add alc_init_jacks() call to other codecs
        ...
      33081adf
    • L
      Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb · c5596049
      Linus Torvalds 提交于
      * 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
        uwb: Orphan the UWB and WUSB subsystems
        uwb: Remove the WLP subsystem and drivers
      c5596049
    • L
      Merge branch 'for_linus' of... · fbaab1dc
      Linus Torvalds 提交于
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platform-drivers-x86: (44 commits)
        eeepc-wmi: Add cpufv sysfs interface
        eeepc-wmi: add additional hotkeys
        panasonic-laptop: Simplify calls to acpi_pcc_retrieve_biosdata
        panasonic-laptop: Handle errors properly if they happen
        intel_pmic_gpio: fix off-by-one value range checking
        IBM Real-Time "SMI Free" mode driver -v7
        Add OLPC XO-1 rfkill driver
        Move hdaps driver to platform/x86
        ideapad-laptop: Fix Makefile
        intel_pmic_gpio: swap the bits and mask args for intel_scu_ipc_update_register
        ideapad: Add param: no_bt_rfkill
        ideapad: Change the driver name to ideapad-laptop
        ideapad: rewrite the sw rfkill set
        ideapad: rewrite the hw rfkill notify
        ideapad: use EC command to control camera
        ideapad: use return value of _CFG to tell if device exist or not
        ideapad: make sure we bind on the correct device
        ideapad: check VPC bit before sync rfkill hw status
        ideapad: add ACPI helpers
        dell-laptop: Add debugfs support
        ...
      fbaab1dc
    • L
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 51f00a47
      Linus Torvalds 提交于
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6:
        mtd/m25p80: add support to parse the partitions by OF node
        of/irq: of_irq.c needs to include linux/irq.h
        of/mips: Cleanup some include directives/files.
        of/mips: Add device tree support to MIPS
        of/flattree: Eliminate need to provide early_init_dt_scan_chosen_arch
        of/device: Rework to use common platform_device_alloc() for allocating devices
        of/xsysace: Fix OF probing on little-endian systems
        of: use __be32 types for big-endian device tree data
        of/irq: remove references to NO_IRQ in drivers/of/platform.c
        of/promtree: add package-to-path support to pdt
        of/promtree: add of_pdt namespace to pdt code
        of/promtree: no longer call prom_ functions directly; use an ops structure
        of/promtree: make drivers/of/pdt.c no longer sparc-only
        sparc: break out some PROM device-tree building code out into drivers/of
        of/sparc: convert various prom_* functions to use phandle
        sparc: stop exporting openprom.h header
        powerpc, of_serial: Endianness issues setting up the serial ports
        of: MTD: Fix OF probing on little-endian systems
        of: GPIO: Fix OF probing on little-endian systems
      51f00a47
    • R
      MIPS: MT: Fix build error iFPU affinity code · a7f505c6
      Ralf Baechle 提交于
      Commit b0ae1981 ("security: remove unused parameter from
      security_task_setscheduler()") broke the build of
      arch/mips/kernel/mips-mt-fpaff.c.  The function arguments were
      unnecessary, not the semicolon ...
      Signed-off-by: NRalf Baechle <ralf@linux-mips.org>
      Acked-by: NKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
      Acked-by: NJames Morris <jmorris@namei.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a7f505c6
    • L
      Merge branch 'ieee1394-removal' of... · b7d41a9f
      Linus Torvalds 提交于
      Merge branch 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
      
      * 'ieee1394-removal' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
        ieee1394: remove the old IEEE 1394 driver stack
        ieee1394: move init_ohci1394_dma to drivers/firewire/
      
      Fix trivial change/delete conflict: drivers/ieee1394/eth1394.c is
      getting removed, but was modified by the networking merge.
      b7d41a9f