1. 07 8月, 2010 29 次提交
  2. 06 8月, 2010 11 次提交
    • L
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · fc1caf6e
      Linus Torvalds 提交于
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (204 commits)
        agp: intel-agp: do not use PCI resources before pci_enable_device()
        agp: efficeon-agp: do not use PCI resources before pci_enable_device()
        drm: kill BKL from common code
        drm/kms: Simplify setup of the initial I2C encoder config.
        drm,io-mapping: Specify slot to use for atomic mappings
        drm/radeon/kms: only expose underscan on avivo chips
        drm/radeon: add new pci ids
        drm: Cleanup after failing to create master->unique and dev->name
        drm/radeon: tone down overchatty acpi debug messages.
        drm/radeon/kms: enable underscan option for digital connectors
        drm/radeon/kms: fix calculation of h/v scaling factors
        drm/radeon/kms/igp: sideport is AMD only
        drm/radeon/kms: handle the case of no active displays properly in the bandwidth code
        drm: move ttm global code to core drm
        drm/i915: Clear the Ironlake dithering flags when the pipe doesn't want it.
        drm/radeon/kms: make sure HPD is set to NONE on analog-only connectors
        drm/radeon/kms: make sure rio_mem is valid before unmapping it
        drm/agp/i915: trim stolen space to 32M
        drm/i915: Unset cursor if out-of-bounds upon mode change (v4)
        drm/i915: Unreference object not handle on creation
        ...
      fc1caf6e
    • L
      Merge branch 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 9779714c
      Linus Torvalds 提交于
      * 'kms-merge' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        kgdb,docs: Update the kgdb docs to include kms
        drm_fb_helper: Preserve capability to use atomic kms
        i915: when kgdb is active display compression should be off
        drm/i915: use new fb debug hooks
        drm: add KGDB/KDB support
        fb: add hooks to handle KDB enter/exit
        kgdboc: Add call backs to allow kernel mode switching
        vt,console,kdb: automatically set kdb LINES variable
        vt,console,kdb: implement atomic console enter/leave functions
      9779714c
    • L
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb · 89a6c8cb
      Linus Torvalds 提交于
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
        debug_core,kdb: fix crash when arch does not have single step
        kgdb,x86: use macro HBP_NUM to replace magic number 4
        kgdb,mips: remove unused kgdb_cpu_doing_single_step operations
        mm,kdb,kgdb: Add a debug reference for the kdb kmap usage
        KGDB: Remove set but unused newPC
        ftrace,kdb: Allow dumping a specific cpu's buffer with ftdump
        ftrace,kdb: Extend kdb to be able to dump the ftrace buffer
        kgdb,powerpc: Replace hardcoded offset by BREAK_INSTR_SIZE
        arm,kgdb: Add ability to trap into debugger on notify_die
        gdbstub: do not directly use dbg_reg_def[] in gdb_cmd_reg_set()
        gdbstub: Implement gdbserial 'p' and 'P' packets
        kgdb,arm: Individual register get/set for arm
        kgdb,mips: Individual register get/set for mips
        kgdb,x86: Individual register get/set for x86
        kgdb,kdb: individual register set and and get API
        gdbstub: Optimize kgdb's "thread:" response for the gdb serial protocol
        kgdb: remove custom hex_to_bin()implementation
      89a6c8cb
    • L
      Merge branch 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6 · 03c0c29a
      Linus Torvalds 提交于
      * 'next-devicetree' of git://git.secretlab.ca/git/linux-2.6: (63 commits)
        of/platform: Register of_platform_drivers with an "of:" prefix
        of/address: Clean up function declarations
        of/spi: call of_register_spi_devices() from spi core code
        of: Provide default of_node_to_nid() implementation.
        of/device: Make of_device_make_bus_id() usable by other code.
        of/irq: Fix endian issues in parsing interrupt specifiers
        of: Fix phandle endian issues
        of/flattree: fix of_flat_dt_is_compatible() to match the full compatible string
        of: remove of_default_bus_ids
        of: make of_find_device_by_node generic
        microblaze: remove references to of_device and to_of_device
        sparc: remove references to of_device and to_of_device
        powerpc: remove references to of_device and to_of_device
        of/device: Replace of_device with platform_device in includes and core code
        of/device: Protect against binding of_platform_drivers to non-OF devices
        of: remove asm/of_device.h
        of: remove asm/of_platform.h
        of/platform: remove all of_bus_type and of_platform_bus_type references
        of: Merge of_platform_bus_type with platform_bus_type
        drivercore/of: Add OF style matching to platform bus
        ...
      
      Fix up trivial conflicts in arch/microblaze/kernel/Makefile due to just
      some obj-y removals by the devicetree branch, while the microblaze
      updates added a new file.
      03c0c29a
    • L
    • L
      Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · f43100ae
      Linus Torvalds 提交于
      * 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        scripts/dtc: Fix a resource leak
        Documentation: fix ubuntu distro name
        MAINTAINERS: Update kbuild git URLs
        Add support for the C variable in the coccicheck script
        Add scripts/coccinelle/deref_null.cocci
        Add scripts/coccinelle/err_cast.cocci
        Add scripts/coccinelle/resource_size.cocci
        Add scripts/coccinelle/alloc/kzalloc-simple.cocci
        Add scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
        Add Documentation/coccinelle.txt
        Add a target to use the Coccinelle checker
        scripts: decodecode: remove bashisms
        Makefile: clarify a comment
        checkkconfigsymbols.sh: Kconfig symbols sometimes have lowercase letters
        scripts: add nconf into gitignore file
      f43100ae
    • L
      Merge branch 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · 27b4a1a9
      Linus Torvalds 提交于
      * 'packaging' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        kbuild: Change section of generated debian packages to kernel
        kbuild: Mark that the packages generated conform to Standards-Version 3.8.4
        kbuild: Add homepage field to debian/control file
      27b4a1a9
    • C
      Staging: wlan-ng: Update prism2_set_tx_power() to use mBm · 9015e499
      Christoph Fritz 提交于
      Commit fa61cf70 updates nl80211's function
      .set_tx_power to use mBm units instead of dBm for greater accuracy and
      smaller power levels.
      
      This patchs updates prism2_set_tx_power() accordingly.
      Signed-off-by: NChristoph Fritz <chf.fritz@googlemail.com>
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      9015e499
    • G
      Staging: Merge staging-next into Linus's tree · e9563355
      Greg Kroah-Hartman 提交于
      Conflicts:
      	drivers/staging/Kconfig
      	drivers/staging/batman-adv/bat_sysfs.c
      	drivers/staging/batman-adv/device.c
      	drivers/staging/batman-adv/hard-interface.c
      	drivers/staging/cx25821/cx25821-audups11.c
      Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
      e9563355
    • L
      Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · e4d6152b
      Linus Torvalds 提交于
      * 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (26 commits)
        kconfig: add savedefconfig
        kconfig: code refactoring in confdata.c
        kconfig: refactor code in symbol.c
        kconfig: add alldefconfig
        kconfig: print more info when we see a recursive dependency
        kconfig: save location of config symbols
        kconfig: change nonint_oldconfig to listnewconfig
        kconfig: rename loose_nonint_oldconfig => oldnoconfig
        kconfig: use long options in conf
        kconfig: fix MODULES-related bug in case of no .config
        kconfig: make randconfig fair for booleans
        kconfig: Don't write invisible choice values
        kbuild: Warn on selecting symbols with unmet direct dependencies
        scripts:conf.c Fix warning: variable 'type' set but not used
        menuconfig: truncate list items
        menuconfig: fix to center checklist correctly in a corner case
        xconfig: add support to show hidden options which have prompts
        xconfig: remove unused function
        xconfig: clean up
        gconfig: fix null pointer warning
        ...
      e4d6152b
    • L
      Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6 · da9e82b3
      Linus Torvalds 提交于
      * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6:
        modpost: support objects with more than 64k sections
        trivial: fix a typo in a filename
        frv: clean up arch/frv/Makefile
        kbuild: allow assignment to {A,C}FLAGS_KERNEL on the command line
        kbuild: allow assignment to {A,C,LD}FLAGS_MODULE on the command line
        Kbuild: Add option to set -femit-struct-debug-baseonly
        Makefile: "make kernelrelease" should show the correct full kernel version
        Makefile.build: make KBUILD_SYMTYPES work again
      da9e82b3