Merge branch 'pmem-api' into libnvdimm-for-next (4a9bf88a) · Commits · Clea OS / bsp / nxp / linux-seco-imx · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

linux-seco-imx
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Iterations
- Jira
- Terraform modules
- Model experiments

Snippets Groups Projects

4a9bf88a

Commit 4a9bf88a authored 9 years ago by Dan Williams

Downloads
- Plain Diff

Merge branch 'pmem-api' into libnvdimm-for-next

parents a06a7576 67a3e8fe

No related branches found

No related tags found

No related merge requests found

Changes 56

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/filesystems/Locking 2 additions, 1 deletion

Documentation/filesystems/Locking
MAINTAINERS 1 addition, 0 deletions

MAINTAINERS
arch/arm/mach-clps711x/board-cdb89712.c 1 addition, 1 deletion

arch/arm/mach-clps711x/board-cdb89712.c
arch/arm/mach-shmobile/pm-rcar.c 1 addition, 1 deletion

arch/arm/mach-shmobile/pm-rcar.c
arch/ia64/include/asm/io.h 1 addition, 0 deletions

arch/ia64/include/asm/io.h
arch/ia64/kernel/cyclone.c 1 addition, 1 deletion

arch/ia64/kernel/cyclone.c
arch/powerpc/kernel/pci_of_scan.c 1 addition, 1 deletion

arch/powerpc/kernel/pci_of_scan.c
arch/powerpc/sysdev/axonram.c 4 additions, 3 deletions

arch/powerpc/sysdev/axonram.c
arch/sh/include/asm/io.h 1 addition, 0 deletions

arch/sh/include/asm/io.h
arch/sparc/kernel/pci.c 1 addition, 2 deletions

arch/sparc/kernel/pci.c
arch/x86/Kconfig 1 addition, 0 deletions

arch/x86/Kconfig
arch/x86/include/asm/cacheflush.h 2 additions, 71 deletions

arch/x86/include/asm/cacheflush.h
arch/x86/include/asm/io.h 0 additions, 6 deletions

arch/x86/include/asm/io.h
arch/x86/include/asm/pmem.h 160 additions, 0 deletions

arch/x86/include/asm/pmem.h
arch/xtensa/include/asm/io.h 1 addition, 0 deletions

arch/xtensa/include/asm/io.h
drivers/acpi/Kconfig 1 addition, 0 deletions

drivers/acpi/Kconfig
drivers/acpi/nfit.c 31 additions, 24 deletions

drivers/acpi/nfit.c
drivers/acpi/nfit.h 11 additions, 5 deletions

drivers/acpi/nfit.h
drivers/block/brd.c 2 additions, 2 deletions

drivers/block/brd.c
drivers/isdn/icn/icn.h 1 addition, 1 deletion

drivers/isdn/icn/icn.h

with 224 additions and 119 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment