From: Alan Cox <alan@linux.intel.com>
Date: Fri, 7 Aug 2009 18:23:19 +0000 (+0100)
Subject: Staging: sep: merge the two files
X-Git-Tag: v2.6.32-rc1~668^2~207
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0097a69d55d1dd0349f8d76da50eb882f8e5af74;p=pandora-kernel.git

Staging: sep: merge the two files

Now we have it trimmed down a bit merge the two pieces so we can clean it up
properly. Code moves but no changes in functions.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

Reading git-diff-tree failed