tree f122521b0ac17e1de695a3be84da50759645da6a
parent e128c5e26bd474a2a56b96ec7c8967aff347b763
parent 5414e557fca545614ceedc3d3496f747457e2e3b
author Linus Torvalds <torvalds@linux-foundation.org> 1297369163 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1297369163 -0800

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  staging: zram: fix data corruption issue
  Staging: Comedi: Fix a few NI module dependencies
  Staging: comedi: Add MODULE_LICENSE and similar to NI modules
  staging: brcm80211: bugfix for softmac crash on multi cpu configurations
  staging: sst: Fix for dmic capture on v2 pmic
  staging: hv: Enable sending GARP packet after live migration