Merge branch 'next' into efi-next-merge
Conflicts: arch/x86/boot/compressed/eboot.c
This commit is contained in:
@@ -236,3 +236,4 @@ MODULE_ALIAS("platform:rtc-efi");
|
||||
MODULE_AUTHOR("dann frazier <dannf@hp.com>");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_DESCRIPTION("EFI RTC driver");
|
||||
MODULE_ALIAS("platform:rtc-efi");
|
||||
|
Reference in New Issue
Block a user