Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[linux-2.6] / include / asm-m68k / emergency-restart.h
2005-07-26  Linus TorvaldsMerge /pub/scm/linux/kernel/git/davem/net-2.6
2005-07-26  Linus TorvaldsMerge master.kernel.org:/home/rmk/linux-2.6-arm
2005-07-26  Linus TorvaldsMerge kernel.org:/home/rmk/linux-2.6-arm-smp
2005-07-26  Eric W. Biederman[PATCH] Add emergency_restart()