diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 19:18:02 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-04-12 19:18:02 +0200 |
commit | 07820c3bf17822361b25f1015125fd407d9925ed (patch) | |
tree | 5fdd7596e5006f0e75ab59b01b846fc017ea666f /kernel/time/timekeeping_internal.h | |
parent | Merge tag 'asm-generic' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd... (diff) | |
parent | microblaze: Use generic pci_mmap_resource_range() (diff) | |
download | linux-07820c3bf17822361b25f1015125fd407d9925ed.tar.xz linux-07820c3bf17822361b25f1015125fd407d9925ed.zip |
Merge tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek:
"Use generic pci_mmap_resource_range()"
* tag 'microblaze-4.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze: Use generic pci_mmap_resource_range()
microblaze: Provide pgprot_device/writecombine macros for nommu
Diffstat (limited to 'kernel/time/timekeeping_internal.h')
0 files changed, 0 insertions, 0 deletions