projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b689713 7190632)
Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:22:31 +0000 (11:22 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 13 Oct 2012 02:22:31 +0000 (11:22 +0900)
Pull UAPI disintegration for misc arches from David Howells:
 "UAPI disintegration for MN10300, FRV and AVR32 arches"

* tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowells/linux-headers:
  UAPI: (Scripted) Disintegrate arch/mn10300/include/asm
  UAPI: (Scripted) Disintegrate arch/frv/include/asm
  UAPI: (Scripted) Disintegrate arch/avr32/include/asm

1  2 
arch/frv/include/asm/ptrace.h patch | diff1 | diff2 | blob | history
arch/frv/include/asm/unistd.h patch | diff1 | diff2 | blob | history
arch/mn10300/include/asm/ptrace.h patch | diff1 | diff2 | blob | history
arch/mn10300/include/asm/unistd.h patch | diff1 | diff2 | blob | history

diff --cc arch/frv/include/asm/ptrace.h
Simple merge
diff --cc arch/frv/include/asm/unistd.h
Simple merge
diff --cc arch/mn10300/include/asm/ptrace.h
Simple merge
diff --cc arch/mn10300/include/asm/unistd.h
Simple merge
John Crispins staging tree