aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 07:27:44 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-12-20 07:27:44 -0800
commit43260ade2ae649e9ec7655630fd58dce7d8ed6ae (patch)
tree6b721aa856a399471e29ede10bbf6a4db792bd77 /arch
parent0c5445015c8e37d4f79c16fa51be398c4cb0e46c (diff)
parent1ec94e75def550548725a0bd77312ed6c266687a (diff)
parentf7f4dc10e1eb04eb8426a192a314b64444a333f4 (diff)
parentd66d8c7187989cedae43cb349626a7f304c60ec6 (diff)
downloadlinux-stericsson-43260ade2ae649e9ec7655630fd58dce7d8ed6ae.tar.gz
Merge tags 'disintegrate-h8300-20121219', 'disintegrate-m32r-20121219' and 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers
Pull UAPI disintegration for H8/300, M32R and Score from David Howells. Scripted UAPI patches for architectures that apparently never reacted to it on their own. * tag 'disintegrate-h8300-20121219' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate arch/h8300/include/asm * tag 'disintegrate-m32r-20121219' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate arch/m32r/include/asm * tag 'disintegrate-score-20121220' of git://git.infradead.org/users/dhowells/linux-headers: UAPI: (Scripted) Disintegrate arch/score/include/asm