diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-03 13:15:46 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-03 13:15:46 -0800 |
commit | 0921f1efb605d8fda43d794734222d1ad39c6840 (patch) | |
tree | 77217e0a0322e39e7367064bf75e4cbcb33479b5 /mm/huge_memory.c | |
parent | 15f93405aae307a3cb2c33c795286463601963f7 (diff) | |
parent | 4247896f4b8bdbe2c9a03c2f713b636e94eab210 (diff) | |
download | blackbird-op-linux-0921f1efb605d8fda43d794734222d1ad39c6840.tar.gz blackbird-op-linux-0921f1efb605d8fda43d794734222d1ad39c6840.zip |
Merge tag 'cris-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris
Pull CRIS changes from Jesper Nilsson:
"Mostly another batch of code removal due to move to standard
frameworks for CRISv32, initial devicetree configuration for a couple
of boards, and some small fixes for kgdb and time handling"
* tag 'cris-for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris:
cris: Drop reference to get_cmos_time()
CRIS: Drop code related to obsolete or unused kconfigs
cris: time: Cleanup of persistent clock stuff
cris: re-use helpers to dump data in hex format
CRIS v32: remove old GPIO and LEDs code
CRIS v32: remove I2C bitbanging driver
CRIS v32: add ARTPEC-3 and P1343 device trees
CRIS v32: dev88: add GPIO, LEDs, RTC, temp sensor
CRIS: add dt-bindings symlink
CRIS v32: increase NR_IRQS
cris: arch-v10: kgdb: Add '__used' for static variable is_dyn_brkp
cris: arch-v10: kgdb: Use BAR instead of DTP0 for register P12
cris: kgdb: use native hex2bin
Diffstat (limited to 'mm/huge_memory.c')
0 files changed, 0 insertions, 0 deletions