From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 16 Nov 2010 18:44:50 +0000 (-0800)
Subject: Staging: Merge 2.6.37-rc2 into staging-next
X-Git-Tag: v2.6.38-rc1~423^2~314
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=491acf0032c08a74a4c88032ca1c03b498bfec37;p=pandora-kernel.git

Staging: Merge 2.6.37-rc2 into staging-next

This was necessary in order  to resolve some conflicts that happened
between -rc1 and -rc2 with the following files:
	drivers/staging/bcm/Bcmchar.c
	drivers/staging/intel_sst/intel_sst_app_interface.c

All should be resolved now.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

491acf0032c08a74a4c88032ca1c03b498bfec37
Reading git-diff-tree failed