1. 05 Apr, 2009 9 commits
    • Linus Torvalds's avatar
      Merge branch 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 · 87fc94d5
      Linus Torvalds authored
      * 'avr32-arch' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6:
        avr32: add hardware handshake support to atmel_serial
        avr32: add RTS/CTS/CLK pin selection for the USARTs
        Add RTC support for Merisc boards
        avr32: at32ap700x: setup DMA for AC97C in the machine code
        avr32: at32ap700x: setup DMA for ABDAC in the machine code
        Add Merisc board support
        avr32: use gpio_is_valid() to check USBA vbus_pin I/O line
        atmel-usba-udc: use gpio_is_valid() to check vbus_pin I/O line
        avr32: fix timing LCD parameters for EVKLCD10X boards
        avr32: use GPIO line PB15 on EVKLCD10x boards for backlight
        avr32: configure MCI detect and write protect pins for EVKLCD10x boards
        avr32: set pin mask to alternative 18 bpp for EVKLCD10x boards
        avr32: add pin mask for 18-bit color on the LCD controller
        avr32: fix 15-bit LCDC pin mask to use MSB lines
      87fc94d5
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 3516c6a8
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (714 commits)
        Staging: sxg: slicoss: Specify the license for Sahara SXG and Slicoss drivers
        Staging: serqt_usb: fix build due to proc tty changes
        Staging: serqt_usb: fix checkpatch errors
        Staging: serqt_usb: add TODO file
        Staging: serqt_usb: Lindent the code
        Staging: add USB serial Quatech driver
        staging: document that the wifi staging drivers a bit better
        Staging: echo cleanup
        Staging: BUG to BUG_ON changes
        Staging: remove some pointless conditionals before kfree_skb()
        Staging: line6: fix build error, select SND_RAWMIDI
        Staging: line6: fix checkpatch errors in variax.c
        Staging: line6: fix checkpatch errors in toneport.c
        Staging: line6: fix checkpatch errors in pcm.c
        Staging: line6: fix checkpatch errors in midibuf.c
        Staging: line6: fix checkpatch errors in midi.c
        Staging: line6: fix checkpatch errors in dumprequest.c
        Staging: line6: fix checkpatch errors in driver.c
        Staging: line6: fix checkpatch errors in audio.c
        Staging: line6: fix checkpatch errors in pod.c
        ...
      3516c6a8
    • Linus Torvalds's avatar
      Merge branch 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 714f83d5
      Linus Torvalds authored
      * 'tracing-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (413 commits)
        tracing, net: fix net tree and tracing tree merge interaction
        tracing, powerpc: fix powerpc tree and tracing tree interaction
        ring-buffer: do not remove reader page from list on ring buffer free
        function-graph: allow unregistering twice
        trace: make argument 'mem' of trace_seq_putmem() const
        tracing: add missing 'extern' keywords to trace_output.h
        tracing: provide trace_seq_reserve()
        blktrace: print out BLK_TN_MESSAGE properly
        blktrace: extract duplidate code
        blktrace: fix memory leak when freeing struct blk_io_trace
        blktrace: fix blk_probes_ref chaos
        blktrace: make classic output more classic
        blktrace: fix off-by-one bug
        blktrace: fix the original blktrace
        blktrace: fix a race when creating blk_tree_root in debugfs
        blktrace: fix timestamp in binary output
        tracing, Text Edit Lock: cleanup
        tracing: filter fix for TRACE_EVENT_FORMAT events
        ftrace: Using FTRACE_WARN_ON() to check "freed record" in ftrace_release()
        x86: kretprobe-booster interrupt emulation code fix
        ...
      
      Fix up trivial conflicts in
       arch/parisc/include/asm/ftrace.h
       include/linux/memory.h
       kernel/extable.c
       kernel/module.c
      714f83d5
    • Linus Torvalds's avatar
      Merge branch 'bzip2-lzma-for-linus' of... · 8901e7ff
      Linus Torvalds authored
      Merge branch 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
      
      * 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
        bzip2/lzma: quiet Kconfig warning for INITRAMFS_COMPRESSION_NONE
      8901e7ff
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask · 90975ef7
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask: (36 commits)
        cpumask: remove cpumask allocation from idle_balance, fix
        numa, cpumask: move numa_node_id default implementation to topology.h, fix
        cpumask: remove cpumask allocation from idle_balance
        x86: cpumask: x86 mmio-mod.c use cpumask_var_t for downed_cpus
        x86: cpumask: update 32-bit APM not to mug current->cpus_allowed
        x86: microcode: cleanup
        x86: cpumask: use work_on_cpu in arch/x86/kernel/microcode_core.c
        cpumask: fix CONFIG_CPUMASK_OFFSTACK=y cpu hotunplug crash
        numa, cpumask: move numa_node_id default implementation to topology.h
        cpumask: convert node_to_cpumask_map[] to cpumask_var_t
        cpumask: remove x86 cpumask_t uses.
        cpumask: use cpumask_var_t in uv_flush_tlb_others.
        cpumask: remove cpumask_t assignment from vector_allocation_domain()
        cpumask: make Xen use the new operators.
        cpumask: clean up summit's send_IPI functions
        cpumask: use new cpumask functions throughout x86
        x86: unify cpu_callin_mask/cpu_callout_mask/cpu_initialized_mask/cpu_sibling_setup_mask
        cpumask: convert struct cpuinfo_x86's llc_shared_map to cpumask_var_t
        cpumask: convert node_to_cpumask_map[] to cpumask_var_t
        x86: unify 32 and 64-bit node_to_cpumask_map
        ...
      90975ef7
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param · cab4e4c4
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
        module: use strstarts()
        strstarts: helper function for !strncmp(str, prefix, strlen(prefix))
        arm: allow usage of string functions in linux/string.h
        module: don't use stop_machine on module load
        module: create a request_module_nowait()
        module: include other structures in module version check
        module: remove the SHF_ALLOC flag on the __versions section.
        module: clarify the force-loading taint message.
        module: Export symbols needed for Ksplice
        Ksplice: Add functions for walking kallsyms symbols
        module: remove module_text_address()
        module: __module_address
        module: Make find_symbol return a struct kernel_symbol
        kernel/module.c: fix an unused goto label
        param: fix charp parameters set via sysfs
      
      Fix trivial conflicts in kernel/extable.c manually.
      cab4e4c4
    • Linus Torvalds's avatar
      Merge branch 'core/debugobjects' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · 5412b539
      Linus Torvalds authored
      * 'core/debugobjects' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        debugobjects: delay free of internal objects
        debugobjects: replace static objects when slab cache becomes available
        debug_objects: add boot-parameter toggle to turn object debugging off again
      5412b539
    • Linus Torvalds's avatar
      Merge branch 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · e4c393fd
      Linus Torvalds authored
      * 'printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
        printk: correct the behavior of printk_timed_ratelimit()
        vsprintf: unify the format decoding layer for its 3 users, cleanup
        fix regression from "vsprintf: unify the format decoding layer for its 3 users"
        vsprintf: fix bug in negative value printing
        vsprintf: unify the format decoding layer for its 3 users
        vsprintf: add binary printf
        printk: introduce printk_once()
      
      Fix trivial conflicts (printk_once vs log_buf_kexec_setup() added near
      each other) in include/linux/kernel.h.
      e4c393fd
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc · 0a053e8c
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc: (42 commits)
        atmel-mci: fix sdc_reg typo
        tmio_mmc: add maintainer
        mmc: Add OpenFirmware bindings for SDHCI driver
        sdhci: Add quirk for forcing maximum block size to 2048 bytes
        sdhci: Add quirk for controllers that need IRQ re-init after reset
        sdhci: Add quirk for controllers that need small delays for PIO
        sdhci: Add set_clock callback and a quirk for nonstandard clocks
        sdhci: Add get_{max,timeout}_clock callbacks
        sdhci: Add support for hosts reporting inverted write-protect state
        sdhci: Add support for card-detection polling
        sdhci: Enable only relevant (DMA/PIO) interrupts during transfers
        sdhci: Split card-detection IRQs management from sdhci_init()
        sdhci: Add support for bus-specific IO memory accessors
        mmc_spi: adjust for delayed data token response
        omap_hsmmc: Wait for SDBP
        omap_hsmmc: Fix MMC3 dma
        omap_hsmmc: Disable SDBP at suspend
        omap_hsmmc: Do not prefix slot name
        omap_hsmmc: Allow cover switch to cause rescan
        omap_hsmmc: Add 8-bit bus width mode support
        ...
      0a053e8c
  2. 04 Apr, 2009 7 commits
  3. 03 Apr, 2009 24 commits