Commit 02e24078 authored 14 years ago by Len Brown

Merge branch 'linus' into release


Conflicts:
	arch/x86/kernel/acpi/sleep.c

Signed-off-by: Len Brown <len.brown@intel.com>

No related branches found

No related tags found

Showing with 615 additions and 30 deletions

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.

Please register or to comment