Merge tag 'disintegrate-misc-arches-20121010' of git://git.infradead.org/users/dhowel...

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

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