| commit | e4c5bf8e3dca827a1b3a6fac494eae8c74b7e1e7 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@suse.de> | Thu Oct 28 09:44:56 2010 -0700 |
| committer | Greg Kroah-Hartman <gregkh@suse.de> | Thu Oct 28 09:44:56 2010 -0700 |
| tree | ea51b391f7d74ca695dcb9f5e46eb02688a92ed9 | |
| parent | 81280572ca6f54009edfa4deee563e8678784218 [diff] | |
| parent | a4ac0d847af9dd34d5953a5e264400326144b6b2 [diff] |
Merge 'staging-next' to Linus's tree This merges the staging-next tree to Linus's tree and resolves some conflicts that were present due to changes in other trees that were affected by files here. Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>