Merge 'staging-next' to Linus's tree (e4c5bf8e) · Commits · github.com / kvm-riscv / linux

Commit e4c5bf8e authored Oct 28, 2010 by

Greg Kroah-Hartman

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>

parents 81280572 a4ac0d84

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment