1
linux/drivers/staging/tidspbridge
Linus Torvalds 949f6711b8 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* '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
2011-01-10 16:04:53 -08:00
..
core Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-01-10 16:04:53 -08:00
Documentation staging: ti dspbridge: remove contributor leftovers 2010-07-08 13:31:45 -07:00
dynload staging:ti dspbridge: remove unnecessary volatile variables 2010-07-28 08:22:04 -07:00
gen staging: tidspbridge: remove duplicated include 2010-10-05 11:42:20 -07:00
hw Revert "staging: tidspbridge - remove hw directory" 2010-11-10 18:34:43 -06:00
include/dspbridge Revert "staging: tidspbridge: replace iommu custom for opensource implementation" 2010-11-10 18:34:44 -06:00
pmgr Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name" 2010-11-10 18:34:44 -06:00
rmgr drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
Kconfig Revert "staging: tidspbridge - update Kconfig to select IOMMU module" 2010-11-10 18:34:42 -06:00
Makefile Revert "staging: tidspbridge - remove hw directory" 2010-11-10 18:34:43 -06:00
TODO staging: tidspbridge: add memory consistency to TODO list 2010-10-09 13:49:41 -07:00