| commit | 491acf0032c08a74a4c88032ca1c03b498bfec37 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Tue Nov 16 10:44:50 2010 -0800 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Tue Nov 16 10:44:50 2010 -0800 |
| tree | b7194d3afb144fa007d0ca6a11c96297f36d42f8 | |
| parent | 06fc8846a2c0ddcc51e6666a78fc29a8e749ca3b [diff] | |
| parent | e53beacd23d9cb47590da6a7a7f6d417b941a994 [diff] |
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>