diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-03-04 08:39:02 -0800 |
| commit | f341dddf1dadf64be309791f83d7904245f1261d (patch) | |
| tree | 974c9e1f23da6743532162fd86cf019da497eaff /drivers/staging | |
| parent | eaa5eec739637f32f8733d528ff0b94fd62b1214 (diff) | |
| parent | b02957d58a27525499ab10d272d3b44682a7ae50 (diff) | |
Staging: merge staging patches into Linus's main branch
There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch. This merge resolves those merge conflicts.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')