Merge branch 'linus' into locking/core, to pick up fixes (6f387515) · 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

6f387515

Commit 6f387515 authored 8 years ago by Ingo Molnar

Downloads
- Plain Diff

Merge branch 'linus' into locking/core, to pick up fixes


Signed-off-by: Ingo Molnar <mingo@kernel.org>

parents f4ec57b6 04516981

No related branches found

No related tags found

No related merge requests found

Changes 446

Hide whitespace changes

Inline Side-by-side

Showing

CREDITS 4 additions, 4 deletions

CREDITS
Documentation/devicetree/bindings/net/ethernet.txt 20 additions, 4 deletions

Documentation/devicetree/bindings/net/ethernet.txt
Documentation/networking/nf_conntrack-sysctl.txt 5 additions, 2 deletions

Documentation/networking/nf_conntrack-sysctl.txt
MAINTAINERS 14 additions, 9 deletions

MAINTAINERS
Makefile 9 additions, 4 deletions

Makefile
arch/arc/include/asm/delay.h 5 additions, 4 deletions

arch/arc/include/asm/delay.h
arch/arc/include/asm/pgtable.h 1 addition, 1 deletion

arch/arc/include/asm/pgtable.h
arch/arc/mm/cache.c 1 addition, 1 deletion

arch/arc/mm/cache.c
arch/arm/boot/dts/Makefile 1 addition, 1 deletion

arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx7s.dtsi 2 additions, 3 deletions

arch/arm/boot/dts/imx7s.dtsi
arch/arm/boot/dts/orion5x-linkstation-lsgl.dts 4 additions, 0 deletions

arch/arm/boot/dts/orion5x-linkstation-lsgl.dts
arch/arm/boot/dts/stih407-family.dtsi 16 additions, 0 deletions

arch/arm/boot/dts/stih407-family.dtsi
arch/arm/boot/dts/sun5i-gr8-evb.dts 1 addition, 1 deletion

arch/arm/boot/dts/sun5i-gr8-evb.dts
arch/arm/boot/dts/sun5i-gr8.dtsi 0 additions, 0 deletions

arch/arm/boot/dts/sun5i-gr8.dtsi
arch/arm/boot/dts/sun8i-h3.dtsi 1 addition, 1 deletion

arch/arm/boot/dts/sun8i-h3.dtsi
arch/arm/include/asm/Kbuild 0 additions, 1 deletion

arch/arm/include/asm/Kbuild
arch/arm/kernel/Makefile 1 addition, 1 deletion

arch/arm/kernel/Makefile
arch/arm/kernel/armksyms.c 183 additions, 0 deletions

arch/arm/kernel/armksyms.c
arch/arm/kernel/entry-ftrace.S 0 additions, 3 deletions

arch/arm/kernel/entry-ftrace.S
arch/arm/kernel/head.S 0 additions, 3 deletions

arch/arm/kernel/head.S

with 268 additions and 43 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