diff options
| author | Matt Fleming <[email protected]> | 2014-10-03 21:15:56 +0000 |
|---|---|---|
| committer | Matt Fleming <[email protected]> | 2014-10-03 21:15:56 +0000 |
| commit | 75b128573b275d5a5a7210b98c4b8cb3b39c12e7 (patch) | |
| tree | e607db32fd303246ee9b93af83a611fc7b93479a /lib/string.c | |
| parent | Linux 3.17-rc7 (diff) | |
| parent | rtc: Disable EFI rtc for x86 (diff) | |
| download | kernel-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.tar.gz kernel-75b128573b275d5a5a7210b98c4b8cb3b39c12e7.zip | |
Merge branch 'next' into efi-next-merge
Conflicts:
arch/x86/boot/compressed/eboot.c
Diffstat (limited to 'lib/string.c')
0 files changed, 0 insertions, 0 deletions