1. 30 Mar, 2009 18 commits
  2. 29 Mar, 2009 11 commits
  3. 28 Mar, 2009 11 commits
    • H. Peter Anvin's avatar
      bzip2/lzma: consistently capitalize LZMA in Kconfig · 55d1d26f
      H. Peter Anvin authored
      Impact: message formatting
      
      Consistently spell LZMA in all capitals, since it (unlike gzip or
      bzip2) is an acronym.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      55d1d26f
    • H. Peter Anvin's avatar
      bzip2/lzma: clarify the meaning of the CONFIG_RD_ options · 337bed41
      H. Peter Anvin authored
      Impact: Kconfig clarification
      
      Make it clear that the CONFIG_RD_* options are about what formats are
      supported, not about what formats are actually being used.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      337bed41
    • H. Peter Anvin's avatar
      bzip2/lzma: move CONFIG_RD_* options under CONFIG_EMBEDDED · 73d8a12f
      H. Peter Anvin authored
      Impact: reduce Kconfig noise
      
      Move the options that control possible initramfs/initrd compressions
      underneath CONFIG_EMBEDDED.  The only impact of leaving these options
      set to y is additional code in the init section of the kernel; there
      is no reason to burden non-embedded users with these options.
      Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
      73d8a12f
    • Ingo Molnar's avatar
      Merge branch 'linus' into core/futexes · d00ab2fd
      Ingo Molnar authored
      d00ab2fd
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 · 07d43ba9
      Linus Torvalds authored
      * 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
        i2c-core: Some style cleanups
        i2c-piix4: Add support for the Broadcom HT1100 chipset
        i2c-piix4: Add support to SB800 SMBus changes
        i2c-pca-platform: Use defaults if no platform_data given
        i2c-algo-pca: Use timeout for checking the state machine
        i2c-algo-pca: Rework waiting for a free bus
        i2c-algo-pca: Add PCA9665 support
        i2c: Adapt debug macros for KERN_* constants
        i2c-davinci: Fix timeout handling
        i2c: Adapter timeout is in jiffies
        i2c: Set a default timeout value for all adapters
        i2c: Add missing KERN_* constants to printks
        i2c-algo-pcf: Handle timeout correctly
        i2c-algo-pcf: Style cleanups
        eeprom/at24: Remove EXPERIMENTAL
        i2c-nforce2: Add support for MCP67, MCP73, MCP78S and MCP79
        i2c: Clarify which clients are auto-removed
        i2c: Let checkpatch shout on users of the legacy model
        i2c: Document the different ways to instantiate i2c devices
      07d43ba9
    • Linus Torvalds's avatar
      Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm · 0fe41b89
      Linus Torvalds authored
      * 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
        [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
        [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
        [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
        [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
        imxfb: Fix TFT mode
        i.MX21/27: remove ifdef CONFIG_FB_IMX
        imxfb: add clock support
        mxc: add arch_reset() function
        clkdev: add possibility to get a clock based on the device name
        i.MX1: remove fb support from mach-imx
        [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
        Gemini: Add support for Teltonika RUT100
        Gemini: gpiolib based GPIO support v2
        MAINTAINERS: add myself as Gemini architecture maintainer
        ARM: Add Gemini architecture v3
        [ARM] OMAP: Fix compile for omap2_init_common_hw()
        MAINTAINERS: Add myself as Faraday ARM core variant maintainer
        ARM: Add support for FA526 v2
        [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
        [ARM] collie: fix two minor formatting nits
        ...
      0fe41b89
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30 · eedf2c52
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-async-for-30:
        fastboot: remove duplicate unpack_to_rootfs()
        ide/net: flip the order of SATA and network init
        async: remove the temporary (2.6.29) "async is off by default" code
      
      Fix up conflicts in init/initramfs.c manually
      eedf2c52
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6 · 0151f94f
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/blackfin-2.6:
        Blackfin arch: be less noisy when gets a gpio conflict after kernel has booted
        Blackfin arch: add RSI's definitions to bf514 and bf516
        Blackfin arch: add link-time asserts to make sure on-chip regions dont overflow
        Blackfin arch: sport spi needs 6 gpio pins
        Blackfin arch: add sport-spi related resource stuff to board file
        Blackfin arch: Blacklist Hibernate (PM_SUSPEND_MEM) on BF561 as well
        Blackfin arch: Privide BF537-STAMP platform data of ADP5520 Multifunction driver
        Blackfin arch: enable the platfrom PATA driver with CF Cards
        Blackfin arch: clean up sports header file
        Blackfin arch: convert BF5{18,27,48}_FAMILY to CONFIG_BF{51,52,54}x
        Blackfin arch: bf51x processors also have 8 timers
        Blackfin arch: add a check to make sure only Blackfin GPIOs may generate IRQs
        Blackfin arch: update default kernel configuration
        Blackfin arch: include linux headers that this one uses definitions from fro sport drivers
      0151f94f
    • Linus Torvalds's avatar
      Merge branch 'percpu-cpumask-x86-for-linus-2' of... · 7c730ccd
      Linus Torvalds authored
      Merge branch 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
      
      * 'percpu-cpumask-x86-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (682 commits)
        percpu: fix spurious alignment WARN in legacy SMP percpu allocator
        percpu: generalize embedding first chunk setup helper
        percpu: more flexibility for @dyn_size of pcpu_setup_first_chunk()
        percpu: make x86 addr <-> pcpu ptr conversion macros generic
        linker script: define __per_cpu_load on all SMP capable archs
        x86: UV: remove uv_flush_tlb_others() WARN_ON
        percpu: finer grained locking to break deadlock and allow atomic free
        percpu: move fully free chunk reclamation into a work
        percpu: move chunk area map extension out of area allocation
        percpu: replace pcpu_realloc() with pcpu_mem_alloc() and pcpu_mem_free()
        x86, percpu: setup reserved percpu area for x86_64
        percpu, module: implement reserved allocation and use it for module percpu variables
        percpu: add an indirection ptr for chunk page map access
        x86: make embedding percpu allocator return excessive free space
        percpu: use negative for auto for pcpu_setup_first_chunk() arguments
        percpu: improve first chunk initial area map handling
        percpu: cosmetic renames in pcpu_setup_first_chunk()
        percpu: clean up percpu constants
        x86: un-__init fill_pud/pmd/pte
        x86: remove vestigial fix_ioremap prototypes
        ...
      
      Manually merge conflicts in arch/ia64/kernel/irq_ia64.c
      7c730ccd
    • Zhenwen Xu's avatar
      i2c-core: Some style cleanups · 09b8ce0a
      Zhenwen Xu authored
      Some lines over 80. 
      The printk(KERN_ERR ... ) should be dev_err.
      And some blankspace should be deleted.
      Signed-off-by: default avatarZhenwen Xu <helight.xu@gmail.com>
      Signed-off-by: default avatarJean Delvare <khlai@linux-fr.org>
      09b8ce0a
    • Flavio Leitner's avatar
      i2c-piix4: Add support for the Broadcom HT1100 chipset · 506a8b6c
      Flavio Leitner authored
      Add support for the Broadcom HT1100 LD chipset (SMBus function.)
      Signed-off-by: default avatarFlavio Leitner <fbl@redhat.com>
      Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
      506a8b6c