summaryrefslogtreecommitdiff
path: root/arch/score/include/uapi/asm
diff options
context:
space:
mode:
authorDoug Ledford <dledford@redhat.com>2016-06-23 12:22:33 -0400
committerDoug Ledford <dledford@redhat.com>2016-06-23 12:22:33 -0400
commit9903fd1374e913f5086b58af09d4e3fd6e9e86fe (patch)
tree4af6b5731d60719061b553b7ac0697797097743b /arch/score/include/uapi/asm
parentc0cf4512a31eb3cec70b066bc36ed55f7d05b8c0 (diff)
parentc755f4afa66ad3ed98870bd3254f37c47fb2c800 (diff)
parent7748e4990de42ea796543c0ffd34118c3a5e6a98 (diff)
parentcbc9355a939b90263c58beb855f8151b56634c42 (diff)
downloadlinux-9903fd1374e913f5086b58af09d4e3fd6e9e86fe.tar.gz
Merge branches '4.7-rc-misc', 'hfi1-fixes', 'i40iw-rc-fixes' and 'mellanox-rc-fixes' into k.o/for-4.7-rc