Skip to content
  • Linus Torvalds's avatar
    Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 1c32ca9f
    Linus Torvalds authored
    * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (38 commits)
      Revert "staging: tidspbridge: replace iommu custom for opensource implementation"
      Revert "staging: tidspbridge - move shared memory iommu maps to tiomap3430.c"
      Revert "staging: tidspbridge - rename bridge_brd_mem_map/unmap to a proper name"
      Revert "staging: tidspbridge - remove custom mmu code from tiomap3430.c"
      Revert "staging: tidspbridge - fix mmufault support"
      Revert "staging: tidspbridge - remove hw directory"
      Revert "staging: tidspbridge - move all iommu related code to a new file"
      Revert "staging: tidspbridge: remove dw_dmmu_base from cfg_hostres struct"
      Revert "staging: tidspbridge - remove reserved memory clean up"
      Revert "staging: tidspbridge - deprecate reserve/unreserve_memory funtions"
      Revert "staging: tidspbridge - remove dmm custom module"
      Revert "staging: tidspbridge - update Kconfig to select IOMMU module"
      staging: tidspbridge: hardcode SCM macros while fix is upstreamed
      Staging: keucr driver: fix uninitialized variable & proper memset length
      omap: dsp: remove shm from normal memory
      Staging: wlan-ng: Fix wrong #ifdef #endif sequence
      Staging: Update parameters for cfg80211 key management operation
      Staging: ath6kl: Fix pointer casts on 64-bit architectures
      Staging: batman-adv: suppress false warning when changing the mac address
      Staging: batman-adv: fix interface alternating and bonding reggression
      ...
    1c32ca9f