1. 11 Jan, 2011 6 commits
    • Joe Perches's avatar
      fs/9p: Remove unnecessary semicolons · 009ca389
      Joe Perches authored
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarEric Van Hensbergen <ericvh@gmail.com>
      009ca389
    • Linus Torvalds's avatar
      Merge branch 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 5b2eef96
      Linus Torvalds authored
      * 'drm-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (390 commits)
        drm/radeon/kms: disable underscan by default
        drm/radeon/kms: only enable hdmi features if the monitor supports audio
        drm: Restore the old_fb upon modeset failure
        drm/nouveau: fix hwmon device binding
        radeon: consolidate asic-specific function decls for pre-r600
        vga_switcheroo: comparing too few characters in strncmp()
        drm/radeon/kms: add NI pci ids
        drm/radeon/kms: don't enable pcie gen2 on NI yet
        drm/radeon/kms: add radeon_asic struct for NI asics
        drm/radeon/kms/ni: load default sclk/mclk/vddc at pm init
        drm/radeon/kms: add ucode loader for NI
        drm/radeon/kms: add support for DCE5 display LUTs
        drm/radeon/kms: add ni_reg.h
        drm/radeon/kms: add bo blit support for NI
        drm/radeon/kms: always use writeback/events for fences on NI
        drm/radeon/kms: adjust default clock/vddc tracking for pm on DCE5
        drm/radeon/kms: add backend map workaround for barts
        drm/radeon/kms: fill gpu init for NI asics
        drm/radeon/kms: add disabled vbios accessor for NI asics
        drm/radeon/kms: handle NI thermal controller
        ...
      5b2eef96
    • Linus Torvalds's avatar
      Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 8adbf8d4
      Linus Torvalds authored
      * 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        i2c: Constify i2c_client where possible
        i2c-algo-bit: Complain about masters which can't read SCL
        i2c-algo-bit: Refactor adapter registration
        i2c: Add generic I2C multiplexer using GPIO API
        i2c-nforce2: Remove unnecessary cast of pci_get_drvdata
        i2c-i801: Include <linux/slab.h>
      8adbf8d4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin · 0be8c8bd
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: (52 commits)
        Blackfin: encode cpu-rev into uImage name
        Blackfin: bf54x: don't ack GPIO ints when unmasking them
        Blackfin: sram_free_with_lsl: do not ignore return value of sram_free
        Blackfin: boards: add missing "static" to peripheral lists
        Blackfin: DNP5370: new board port
        Blackfin: bf518f-ezbrd: fix dsa resources
        Blackfin: move "-m elf32bfin" to general LDFLAGS
        Blackfin: kgdb_test: make sure to initialize num2
        Blackfin: kgdb: disable preempt schedule when running single step in kgdb
        Blackfin: kgdb: disable interrupt when single stepping in ADEOS
        Blackfin: SMP: kgdb: apply anomaly 257 work around
        Blackfin: fix building IPIPE code when XIP is enabled
        Blackfin: SMP: kgdb: flush core internal write buffer before flushinv
        Blackfin: sport_uart resources: remove unused secondary RX/TX pins
        Blackfin: tll6527m: fix spelling in unused code (struct name)
        Blackfin: bf527-ezkit: add adau1373 chip address
        Blackfin: no-mpu: fix masking of small uncached dma region
        Blackfin: pm: drop irq save/restore in standby and suspend to mem callback
        MAINTAINERS: update Analog Devices support info
        Blackfin: dpmc.h: pull in new pll.h
        ...
      0be8c8bd
    • Linus Torvalds's avatar
      Merge branch 'driver-core-next' of... · e54be894
      Linus Torvalds authored
      Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
      
      * 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
        driver core: Document that device_rename() is only for networking
        sysfs: remove useless test from sysfs_merge_group
        driver-core: merge private parts of class and bus
        driver core: fix whitespace in class_attr_string
      e54be894
    • Linus Torvalds's avatar
      Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 949f6711
      Linus Torvalds authored
      * 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (510 commits)
        staging: speakup: fix failure handling
        staging: usbip: remove double giveback of URB
        Staging: batman-adv: Remove batman-adv from staging
        Staging: hv: Use only one txf buffer per channel and kmalloc/GFP_KERNEL on initialize
        staging: hv: remove unneeded osd_schedule_callback
        staging: hv: convert channel_mgmt.c to not call osd_schedule_callback
        staging: hv: convert vmbus_on_msg_dpc to not call osd_schedule_callback
        staging: brcm80211: Fix WL_<type> logging macros
        Staging: IIO: DDS: AD9833 / AD9834 driver
        Staging: IIO: dds.h convenience macros
        Staging: IIO: Direct digital synthesis abi documentation
        staging: brcm80211: Convert ETHER_TYPE_802_1X to ETH_P_PAE
        staging: brcm80211: Remove unused ETHER_TYPE_<foo> #defines
        staging: brcm80211: Remove ETHER_HDR_LEN, use ETH_HLEN
        staging: brcm80211: Convert ETHER_ADDR_LEN to ETH_ALEN
        staging: brcm80211: Convert ETHER_IS<FOO> to is_<foo>_ether_addr
        staging: brcm80211: Remove unused ether_<foo> #defines and struct
        staging: brcm80211: Convert ETHER_IS_MULTI to is_multicast_ether_addr
        staging: brcm80211: Remove unused #defines ETHER_<foo>_LOCALADDR
        Staging: comedi: Fix checkpatch.pl issues in file s526.c
        ...
      
      Fix up trivial conflict in drivers/video/udlfb.c
      949f6711
  2. 10 Jan, 2011 34 commits