From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 May 2011 21:23:41 +0000 (-0700)
Subject: Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh... 
X-Git-Tag: v2.6.39-rc7~15
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5895198c56d131cc696556a45f7ff0ea99ac297b;p=platform%2Fkernel%2Flinux-stable.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: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
  staging: intel_sst: intelmid needs delay.h
  staging: solo6x10: add select SND_PCM to fix build error
  staging: usbip: vhci: fix oops on subsequent attach
  staging: ft1000: Remove unnecessary EXPORT_SYMBOLs
  staging: rts_pstor: use #ifdef instead of #if
  staging: rts_pstor: Add <linux/vmalloc.h>
  staging: gma500: Depend on X86
  staging: olpc: Add <linux/delay.h>
---

5895198c56d131cc696556a45f7ff0ea99ac297b