Merge branch 'linus' into cont_syslog
[safe/jmp/linux-2.6] / arch / m68k / include / asm / setup.h
2009-03-16 Greg Ungererm68k: use MMU version of setup.h for both MMU and non-MMU
2009-01-16 Sam Ravnborgm68k,m68knommu: merge header files