1. 11 5月, 2009 1 次提交
  2. 28 4月, 2009 1 次提交
    • M
      x86: clean up alternative.h · edc953fa
      Mathieu Desnoyers 提交于
      Alternative header duplicates assembly that could be merged in
      one single macro.  Merging this into this macro also allows to
      directly declare ALTERNATIVE() statements within assembly code.
      
      Uses a __stringify() of the feature bits rather than passing a
      "i" operand.  Leave the old %0 operand as-is (set to 0), unused
      to stay compatible with API.
      
      (v2: tab alignment fixes)
      
      [ Impact: cleanup ]
      Signed-off-by: NMathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
      LKML-Reference: <20090428151346.GA31212@Krystal>
      Signed-off-by: NIngo Molnar <mingo@elte.hu>
      edc953fa
  3. 27 4月, 2009 23 次提交
  4. 25 4月, 2009 9 次提交
  5. 24 4月, 2009 6 次提交
    • L
      Merge branch 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze · 9f5a6912
      Linus Torvalds 提交于
      * 'fixes-for-linus' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: add parameter to microblaze_read()
        microblaze: Use CFLAGS_KERNEL instead of CFLAGS
        microblaze: Add STATE_SAVE_ARG_SPACE for noMMU kernel too
        microblaze: Do not check use_dcache
        microblaze: Do not use PVR configuration for broken MB version
        microblaze: Fix USR1/2 pvr printing message
        microblaze: iowrite upon timeout
        microblaze: Correspond CONFIG...PCMP in Makefile/Kconfig
        microblaze: Remove redundant variable
        microblaze: Move start_thread to process.c
        microblaze: Add missing preadv and pwritev syscalls
        microblaze: Add missing declaration for die and _exception func
        microblaze: Remove sparse error in traps.c
        microblaze: Move task_pt_regs up
        microblaze: Rename kernel_mode to pt_mode in pt_regs
        microblaze: Remove uncache shadow condition
        microblaze: Remove while(1) loop from show_regs function
        microblaze: Remove unneded per cpu SYSCALL_SAVE variable
      9f5a6912
    • L
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 · ef54b1bb
      Linus Torvalds 提交于
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (34 commits)
        ACPI, i915: Register ACPI video even when not modesetting
        Revert "ACPICA: delete check for AML access to port 0x81-83"
        I/O port protection: update for windows compatibility.
        sony-laptop: always try to unblock rfkill on load
        sony-laptop: fix bogus error message display on resume
        ACPI: EC: Fix ACPI EC resume non-query interrupt message
        sony-laptop: SNC input event 38 fix
        sony-laptop: SNC 127 Initialization Fix
        sony-laptop: Duplicate SNC 127 Event Fix
        ACPI: prevent processor.max_cstate=0 boot crash
        ACPI/hpet: prevent boot hang when hpet=force used on ICH-4M
        ACPI: delete obsolete "bus master activity" proc field
        ACPI: idle: mark_tsc_unstable() at init-time, not run-time
        ACPI: add /sys/firmware/acpi/interrupts/sci_not counter
        ACPI video: fix an error when the brightness levels on AC and on Battery are same
        acpi-cpufreq: Do not let get_measured perf depend on internal variable
        acpi-cpufreq: style-only: add parens to math expression
        acpi-cpufreq: Cleanup: Use printk_once
        x86, acpi_cpufreq: Fix the NULL pointer dereference in get_measured_perf
        thinkpad-acpi: bump up version to 0.23
        ...
      ef54b1bb
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · 9fe9293d
      Linus Torvalds 提交于
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        m68knommu: update the default config for the ColdFire 5407C3 board
        m68knommu: update the default config for the ColdFire 5307C3 board
        m68knommu: update the default config for the ColdFire 5257EVB board
        m68knommu: update the default config for the ColdFire 5249EVB.
        m68knommu: add a defconfig for the ColdFire M5272C3 board
        m68knommu: update the defconfig for the ColdFire 5208evb board
        m68knommu: fix DMA support for ColdFire
        m68knommu: remove unused kernel stats offsets
        m68knommu: fix missing .data.cacheline_aligned section
        m68knommu: Fixed GPIO pin initialization for CONFIG_M5271 FEC.
      9fe9293d
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · a4277bf1
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: Fix potential inode allocation soft lockup in Orlov allocator
        ext4: Make the extent validity check more paranoid
        jbd: use SWRITE_SYNC_PLUG when writing synchronous revoke records
        jbd2: use SWRITE_SYNC_PLUG when writing synchronous revoke records
        ext4: really print the find_group_flex fallback warning only once
      a4277bf1
    • L
      Merge master.kernel.org:/home/rmk/linux-2.6-arm · 6ae85d6d
      Linus Torvalds 提交于
      * master.kernel.org:/home/rmk/linux-2.6-arm:
        [ARM] 5460/1: Orion: reduce namespace pollution
        [ARM] 5458/1: pcmcia: pxa2xx-sharpsl: check if we do have Scoop config
        [ARM] 5457/1: mach-imx gpio buildfix
        [ARM] 5456/1: add sys_preadv and sys_pwritev
        [ARM] pxa/pcm990: start external GPIOs immediately after built-in ones
        [ARM] pxa/palm27x: General fix for Palm27x aSoC driver
        [ARM] pxa/mioa701: use GPIO95 as AC97 reset line
        [ARM] pxa: merge AC97 platform data structures
        [ARM] pxa/magician: remove un-necessary #include of pxa-regs.h and hardware.h
      6ae85d6d
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6 · d72cd3a9
      Linus Torvalds 提交于
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6:
        USB: pwc : do not pass stack allocated buffers to USB core.
        USB: otg: Fix bug on remove path without transceiver
        USB: correct error handling in cdc-wdm
        USB: removal of tty->low_latency hack dating back to the old serial code
        USB: serial: sierra driver bug fix for composite interface
        USB: gadget: omap_udc uses platform_driver_probe()
        USB: ci13xxx_udc: fix build error
        USB: musb: Prevent multiple includes of musb.h
        USB: pass mem_flags to dma_alloc_coherent
        USB: g_file_storage: fix use-after-free bug when closing files
        USB: ehci-sched.c: EHCI SITD scheduling bugfix
        USB: fix mos7840 problem with minor numbers
        USB: mos7840: add new device id
        USB: musb: fix build when !CONFIG_PM
        USB: musb: Remove my email address from few musb related drivers
        USB: Gadget: MIPS CI13xxx UDC bugfixes
        USB: Unusual Device support for Gold MP3 Player Energy
        USB: serial: fix lifetime and locking problems
      d72cd3a9