Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
[safe/jmp/linux-2.6] / arch / m68k / include / asm / amigayle.h
2010-05-26 Geert Uytterhoevenm68k: amiga - Amiga Gayle IDE platform device conversion
2009-01-16 Sam Ravnborgm68k,m68knommu: merge header files