Merge branch 'for-linus' of git://neil.brown.name/md

[linux-2.6] / include / asm-frv / Kbuild

include include/asm-generic/Kbuild.asm

header-y += registers.h

unifdef-y += termios.h
unifdef-y += ptrace.h