| commit | 0097a69d55d1dd0349f8d76da50eb882f8e5af74 | [log] [tgz] |
|---|---|---|
| author | Alan Cox <alan@linux.intel.com> | Fri Aug 07 19:23:19 2009 +0100 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Tue Sep 15 12:02:13 2009 -0700 |
| tree | 7ca90c439f897a0824835134fed08356dd49aff0 | |
| parent | 8407248231df774ba81d0b968bf112edb4069461 [diff] |
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>