1. 11 Jan, 2011 2 commits
    • 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 38 commits