diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 17:10:53 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-04-24 17:10:53 +0200 |
| commit | fb65d872d7a8dc629837a49513911d0281577bfd (patch) | |
| tree | 0c6928094671d99e24f17e778468763a7ce52662 /drivers/xen | |
| parent | Merge tag 'nios2-v4.1-rc1' of git://git.rocketboards.org/linux-socfpga-next (diff) | |
| parent | Merge branches 'misc' and 'vdso' into for-next (diff) | |
| download | linux-fb65d872d7a8dc629837a49513911d0281577bfd.tar.xz linux-fb65d872d7a8dc629837a49513911d0281577bfd.zip | |
Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
Pull ARM fixes from Russell King:
"A few fixes for the recently merged development updates:
- the update to convert a code branch in the procinfo structure
forgot to update the nommu code.
- VDSO only supported for V7 CPUs and later.
- VDSO build creates files which should be ignored by git but are not.
- ensure that make arch/arm/vdso/ doesn't build if it isn't enabled"
* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm:
ARM: 8344/1: VDSO: honor CONFIG_VDSO in Makefile
ARM: 8343/1: VDSO: add build artifacts to .gitignore
ARM: Fix nommu booting
ARM: 8342/1: VDSO: depend on CPU_V7
Diffstat (limited to 'drivers/xen')
0 files changed, 0 insertions, 0 deletions