Linus Torvalds bad6a5c08c Merge git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc ... * git://git.kernel.org/pub/scm/linux/kernel/git/kyle/rtc-parisc: powerpc/ps3: Add rtc-ps3 powerpc: Hook up rtc-generic, and kill rtc-ppc m68k: Hook up rtc-generic parisc: rtc: Rename rtc-parisc to rtc-generic parisc: rtc: Add missing module alias parisc: rtc: platform_driver_probe() fixups parisc: rtc: get_rtc_time() returns unsigned int		2009-04-03 09:51:35 -07:00
..
Kbuild	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu	2009-01-26 10:33:01 -08:00
MC68EZ328.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
MC68VZ328.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
MC68328.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
MC68332.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
a.out-core.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
a.out.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
adb_iop.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
amigahw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
amigaints.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
amigayle.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
amipcmcia.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
anchor.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
apollodma.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
apollohw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atafd.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atafdreg.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atari_joystick.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atari_stdma.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atari_stram.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atarihw.h	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
atariints.h	m68k: atari - Rename "mfp" to "st_mfp"	2009-02-22 09:23:02 -08:00
atarikb.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atomic.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atomic_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
atomic_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
auxvec.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
bitops.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
bitops_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
bitops_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
blinken.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
bootinfo.h	m68k: use the mmu version of bootinfo.h for m68knommu as well	2009-03-24 15:17:44 +10:00
bootstd.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
bug.h	m68k: merge the mmu and non-mmu versions of bug.h	2009-03-24 15:17:44 +10:00
bugs.h	m68k: merge the mmu and non-mmu versions of bugs.h	2009-03-24 15:17:45 +10:00
bvme6000hw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
byteorder.h	m68k{nommu}: fixups after the header move	2009-01-26 10:38:43 -08:00
cache.h	m68k: use the mmu version of cache.h for m68knommu as well	2009-03-24 15:17:44 +10:00
cachectl.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
cacheflush.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
cacheflush_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
cacheflush_no.h	m68knommu: fix cache flushing for the 527x ColdFire processors	2009-01-27 16:42:00 +10:00
checksum.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
checksum_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
checksum_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
coldfire.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
commproc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
contregs.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
cputime.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
current.h	m68k: merge the mmu and non-mmu versions of current.h	2009-03-24 15:17:45 +10:00
dbg.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
delay.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
delay_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
delay_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
device.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
div64.h	m68k: merge the mmu and non-mmu versions of div64.h	2009-03-24 15:17:45 +10:00
dma-mapping.h	m68k: swtich non-mmu setups to use the mmu dma-mapping.h	2009-03-24 15:17:41 +10:00
dma.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
dma_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
dma_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
dsp56k.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
dvma.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
elf.h	m68k: use mmu version of elf.h for non-mmu builds as well	2009-03-24 15:17:42 +10:00
elia.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
emergency-restart.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
entry.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
entry_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
entry_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
errno.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
fb.h	m68k: merge the mmu and non-mmu versions of fb.h	2009-03-24 15:17:44 +10:00
fbio.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
fcntl.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
flat.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
floppy.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
fpu.h	m68k: use mmu fpu.h for non-mmu builds as well	2009-03-24 15:17:42 +10:00
futex.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
hardirq.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
hardirq_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
hardirq_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
hp300hw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
hw_irq.h	m68k: the one hw_irq.h can be used buy all m68k	2009-03-24 15:17:42 +10:00
hwtest.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ide.h	ide: cleanup <asm-m68k/ide.h>	2009-03-27 12:46:23 +01:00
idprom.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
intersil.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
io.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
io_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
io_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ioctl.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ioctls.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ipcbuf.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
irq.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
irq_mm.h	m68k: irq_node.handler() should return irqreturn_t	2009-03-26 21:15:30 +01:00
irq_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
irq_regs.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
kdebug.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
kmap_types.h	m68k: use mmu kmap_types.h for non-mmu setups as well	2009-03-24 15:17:41 +10:00
linkage.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
local.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m520xsim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m523xsim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m527xsim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m528xsim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m532xsim.h	m68knommu: add missing interrupt line definition for UART 2	2009-03-24 15:17:45 +10:00
m5206sim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m5249sim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m5272sim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m5307sim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m5407sim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m68360.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m68360_enet.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m68360_pram.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m68360_quicc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
m68360_regs.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_asc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_baboon.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_iop.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_mouse.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_oss.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_psc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mac_via.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
machdep.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
machdep_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
machdep_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
machines.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
machw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
macintosh.h	m68k: mac - Add a new entry in mac_model to identify the floppy controller type.	2009-03-26 21:15:27 +01:00
macints.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
math-emu.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mc146818rtc.h	m68k: use the mc146818rtc.h for non-mmu setups as well.	2009-03-24 15:17:41 +10:00
mcfcache.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfdma.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfmbus.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfne.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfpit.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfsim.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfsmc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcftimer.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfuart.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mcfwdebug.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
md.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mman.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mmu.h	m68k: merge the mmu and non-mmu versions of mmu.h	2009-03-24 15:17:42 +10:00
mmu_context.h	m68k: merge the mmu and non-mmu versions of mmu_context.h	2009-03-24 15:17:45 +10:00
mmzone.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
module.h	m68k: merge the mmu and non-mmu versions of module.h	2009-03-24 15:17:45 +10:00
motorola_pgalloc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
motorola_pgtable.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
movs.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
msgbuf.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mutex.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mvme16xhw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
mvme147hw.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
nettel.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
nubus.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
openprom.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
oplib.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
page.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
page_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
page_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
page_offset.h	m68k: merge the mmu and non-mmu versions of page_offset.h	2009-03-24 15:17:43 +10:00
param.h	m68k: merge the non-MMU and MMU versions of param.h	2009-03-16 17:52:16 +10:00
parport.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
pci.h	m68k: use the mmu pci.h for m68knommu as well	2009-03-24 15:17:41 +10:00
percpu.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
pgalloc.h	m68k: merge the mmu and non-mmu versions of pgalloc.h	2009-03-24 15:17:43 +10:00
pgtable.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
pgtable_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
pgtable_no.h	m68knommu: mv definition of check_pgt_cache()	2009-03-24 15:17:43 +10:00
poll.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
posix_types.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
processor.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
processor_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
processor_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ptrace.h	m68k: merge the non-MMU and MMU versions of ptrace.h	2009-03-17 08:44:42 +10:00
q40_master.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
q40ints.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
quicc_simple.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
raw_io.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
resource.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
rtc.h	m68k: Hook up rtc-generic	2009-04-02 01:05:31 +00:00
sbus.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
scatterlist.h	m68k: Use dma_addr_t for scatterlist.dma_address	2009-03-24 15:17:43 +10:00
sections.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
segment.h	m68k: merge the mmu and non-mmu versions of segment.h	2009-03-24 15:17:44 +10:00
sembuf.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
serial.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
setup.h	m68k: use MMU version of setup.h for both MMU and non-MMU	2009-03-17 08:44:41 +10:00
shm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
shmbuf.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
shmparam.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sigcontext.h	m68k: merge the non-MMU and MMU versions of sigcontext.h	2009-03-16 18:00:25 +10:00
siginfo.h	m68k: merge the non-MMU and MMU versions of siginfo.h	2009-03-17 08:47:11 +10:00
signal.h	m68k: merge the non-MMU and MMU versions of signal.h	2009-03-17 08:44:42 +10:00
smp.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
spinlock.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
stat.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
statfs.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
string.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
string_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
string_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3-head.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3_pgalloc.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3_pgtable.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3ints.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3mmu.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3x.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3xflop.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
sun3xprom.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
suspend.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
swab.h	m68k: merge the non-MMU and MMU versions of swab.h	2009-03-16 17:54:49 +10:00
system.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
system_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
system_no.h	m68knommu: remove obsolete and unused eLIA board	2009-01-27 16:42:02 +10:00
termbits.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
termios.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
thread_info.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
thread_info_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
thread_info_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
timex.h	m68k: use mmu timex.h for non-mmu setups as well	2009-03-24 15:17:42 +10:00
tlb.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
tlbflush.h	m68k: merge the mmu and non-mmu versions of tlbflush.h	2009-03-24 15:17:45 +10:00
topology.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
traps.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
traps_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
traps_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
types.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
uaccess.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
uaccess_mm.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
uaccess_no.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
ucontext.h	m68k: merge the mmu and non-mmu versions of ucontext.h	2009-03-24 15:17:43 +10:00
unaligned.h	m68k: Restore correct include guards for <asm/unaligned.h>	2009-03-24 15:17:43 +10:00
unistd.h	m68k: use the MMU version of unistd.h for all m68k platforms	2009-03-17 08:44:55 +10:00
user.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
virtconvert.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
xor.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00
zorro.h	m68k,m68knommu: merge header files	2009-01-16 21:58:10 +10:00