From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 19 Apr 2011 13:37:49 +0000 (-0700)
Subject: Staging: merge 2.6.39-rc4 into staging-next
X-Git-Tag: v3.0-rc1~336^2~823
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03068ff131c0a565e2cb26303a0df63467136723;p=pandora-kernel.git

Staging: merge 2.6.39-rc4 into staging-next

This handles the removal of the samsung-laptop driver and other
minor merge issues.

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

03068ff131c0a565e2cb26303a0df63467136723
Reading git-diff-tree failed