tree 26b98358ece87f30b8788603fee48bc9a3a71728
parent 0ecb063a2976b62d5eaecbd5a70bb994fe4b5a8a
parent 9005fcd89c24f2a0fa6f87588b9208aae6d4d6cd
author Linus Torvalds <torvalds@linux-foundation.org> 1304544221 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1304544221 -0700

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: 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>