From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Feb 2011 20:19:23 +0000 (-0800)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v3.0~1858
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b477958314796f51c54829dbaea89b1f46dabd06;p=platform%2Fkernel%2Flinux-amlogic.git

Merge branch 'staging-linus' of git://git./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
---

b477958314796f51c54829dbaea89b1f46dabd06