Linus Torvalds a9a0aff5b5 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k ... * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (24 commits) m68k: amiga - RTC platform device conversion m68k: amiga - Parallel port platform device conversion m68k: amiga - Serial port platform device conversion m68k: amiga - Mouse platform device conversion m68k: amiga - Keyboard platform device conversion m68k: amiga - Amiga Gayle IDE platform device conversion m68k: amiga - A4000T SCSI platform device conversion m68k/scsi: a3000 - Do not use legacy Scsi_Host.base m68k: amiga - A3000 SCSI platform device conversion m68k/scsi: gvp11 - Do not use legacy Scsi_Host.base m68k: amiga - GVP Series II SCSI zorro_driver conversion m68k/scsi: a2091 - Do not use legacy Scsi_Host.base m68k: amiga - A2091/A590 SCSI zorro_driver conversion m68k/scsi: mvme147 - Kill obsolete HOSTS_C logic m68k/scsi: a3000 - Kill a3000_scsiregs typedef m68k/scsi: gvp11 - Kill gvp11_scsiregs typedef m68k/scsi: a2091 - Kill a2091_scsiregs typedef m68k/scsi: gvp11 - Extract check_wd33c93() m68k/scsi: a3000 - Kill static global a3000_host m68k/scsi: mvme147 - Kill static global mvme147_host ...		2010-05-27 10:19:19 -07:00
..
a.out-core.h
a.out.h
adb_iop.h
amigahw.h
amigaints.h
amigayle.h	m68k: amiga - Amiga Gayle IDE platform device conversion	2010-05-26 19:51:09 +02:00
amipcmcia.h
anchor.h
apollodma.h
apollohw.h
asm-offsets.h	kbuild: move asm-offsets.h to include/generated	2009-12-12 13:08:14 +01:00
atafd.h
atafdreg.h
atari_joystick.h
atari_stdma.h
atari_stram.h
atarihw.h
atariints.h
atarikb.h
atomic_mm.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
atomic_no.h	atomic_t: Cast to volatile when accessing atomic variables	2010-05-17 07:57:27 -07:00
atomic.h	m68k: Enable atomic64_t	2010-05-26 19:51:06 +02:00
auxvec.h
bitops_mm.h	m68k: Implement generic_find_next_{zero_,}le_bit()	2010-05-17 21:15:40 +02:00
bitops_no.h
bitops.h
bitsperlong.h
blinken.h
bootinfo.h	tree-wide: fix assorted typos all over the place	2009-12-04 15:39:55 +01:00
bootstd.h
bug.h
bugs.h
bvme6000hw.h
byteorder.h
cache.h	m68k: set ARCH_KMALLOC_MINALIGN	2010-05-26 19:51:06 +02:00
cachectl.h
cacheflush_mm.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
cacheflush_no.h	block: add helpers to run flush_dcache_page() against a bio and a request's pages	2009-11-26 09:16:19 +01:00
cacheflush.h
checksum.h	m68k: merge the mmu and non-mmu versions of checksum.h	2009-09-16 09:43:37 +10:00
coldfire.h
commproc.h
contregs.h
cputime.h
current.h
dbg.h
delay_mm.h
delay_no.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h	m68k: clean up comment delimiters in dma.h	2009-09-16 09:43:38 +10:00
dsp56k.h
dvma.h
elf.h	elf: kill USE_ELF_CORE_DUMP	2009-12-16 07:20:12 -08:00
emergency-restart.h
entry_mm.h	locking, m68k/asm-offsets: Rename signal defines	2009-09-01 09:38:03 +02:00
entry_no.h	locking, m68k/asm-offsets: Rename pt_regs offset defines	2009-08-31 18:08:49 +02:00
entry.h
errno.h
fb.h
fbio.h	tree-wide: s/widht/width/g typo in comments	2010-02-05 12:22:42 +01:00
fcntl.h
flat.h
floppy.h
fpu.h
ftrace.h
futex.h
gpio.h	core generic GPIO support for Freescale Coldfire processors.	2009-09-10 12:01:22 +10:00
hardirq_mm.h	revert "m68k: convert to asm-generic/hardirq.h"	2009-10-01 16:11:11 -07:00
hardirq_no.h	m68knommu: convert to asm-generic/hardirq.h	2009-09-16 09:43:36 +10:00
hardirq.h
hp300hw.h
hw_irq.h
hwtest.h
ide.h
idprom.h
intersil.h
io_mm.h
io_no.h	tree-wide: Assorted spelling fixes	2010-02-09 11:13:56 +01:00
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq_regs.h
irq.h	m68k: merge mmu and non-mmu versions of irq.h	2009-09-16 09:43:37 +10:00
Kbuild
kdebug.h
kmap_types.h
linkage.h
local.h
m520xsim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m523xsim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m527xsim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m528xsim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m532xsim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m5206sim.h	m68knommu: simplify ColdFire "timers" clock initialization	2009-09-16 09:43:51 +10:00
m5249sim.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
m5272sim.h	m68knommu: create a speciailized ColdFire 5272 interrupt controller	2009-09-16 09:43:54 +10:00
m5307sim.h	m68knommu: simplify ColdFire "timers" clock initialization	2009-09-16 09:43:51 +10:00
m5407sim.h	m68knommu: simplify ColdFire "timers" clock initialization	2009-09-16 09:43:51 +10:00
m68360_enet.h
m68360_pram.h
m68360_quicc.h
m68360_regs.h
m68360.h
mac_asc.h
mac_baboon.h
mac_iop.h
mac_mouse.h
mac_oss.h
mac_psc.h
mac_via.h
machdep_mm.h
machdep_no.h
machdep.h
machines.h
machw.h	mac68k: replace mac68k SCC code with platform device	2010-02-27 18:31:09 +01:00
macintosh.h
macints.h	mac68k: replace mac68k SCC code with platform device	2010-02-27 18:31:09 +01:00
math-emu.h	locking, m68k/asm-offsets: Rename pt_regs offset defines	2009-08-31 18:08:49 +02:00
mc146818rtc.h
MC68EZ328.h
MC68VZ328.h
MC68328.h
MC68332.h
mcfcache.h
mcfdma.h
mcfgpio.h	core generic GPIO support for Freescale Coldfire processors.	2009-09-10 12:01:22 +10:00
mcfintc.h	m68knommu: map ColdFire interrupts to correct masking bits	2009-09-16 09:43:52 +10:00
mcfmbus.h
mcfne.h	m68knommu: remove special interrupt handling code for ne2k support	2009-09-16 09:43:55 +10:00
mcfpit.h
mcfqspi.h	m68knommu: Coldfire QSPI platform support	2010-05-17 11:04:19 +10:00
mcfsim.h	m68knommu: move ColdFire INTC definitions to new include file	2009-09-16 09:43:49 +10:00
mcftimer.h
mcfuart.h	m68knommu: fix coldfire tcdrain	2010-04-21 13:43:06 +10:00
mcfwdebug.h
md.h
mman.h	mm: remove duplicate asm/mman.h files	2009-09-22 07:17:42 -07:00
mmu_context.h
mmu.h
mmzone.h
module.h
motorola_pgalloc.h	arch/m68k/include/asm/motorola_pgalloc.h: fix kunmap arg	2009-08-26 23:14:49 +02:00
motorola_pgtable.h
movs.h
msgbuf.h
mutex.h
mvme16xhw.h
mvme147hw.h
nettel.h	generic GPIO support misc files.	2009-09-10 12:01:24 +10:00
nubus.h
openprom.h
oplib.h
page_mm.h
page_no.h	m68knommu: fix definitions of __pa() and __va()	2010-01-12 20:51:45 -08:00
page_offset.h
page.h
param.h	m68k: Simplify param.h by using <asm-generic/param.h>	2010-05-17 21:15:39 +02:00
parport.h
pci.h
percpu.h
pgalloc.h
pgtable_mm.h	MM: Pass a PTE pointer to update_mmu_cache() rather than the PTE itself	2010-02-20 16:41:46 +00:00
pgtable_no.h
pgtable.h
pinmux.h	core generic GPIO support for Freescale Coldfire processors.	2009-09-10 12:01:22 +10:00
poll.h
posix_types.h
processor.h	m68knommu: remove size limit on non-MMU TASK_SIZE	2010-05-24 13:29:54 +10:00
ptrace.h	ptrace: move user_enable_single_step & co prototypes to linux/ptrace.h	2010-03-12 15:52:38 -08:00
q40_master.h
q40ints.h
quicc_simple.h
raw_io.h
resource.h
rtc.h
sbus.h
scatterlist.h	m68k: use asm-generic/scatterlist.h	2010-05-27 09:12:55 -07:00
sections.h
segment.h
sembuf.h
serial.h
setup.h
shm.h
shmbuf.h
shmparam.h
sigcontext.h	m68k: Fix `struct sigcontext' for ColdFire	2010-04-14 19:45:37 +02:00
siginfo.h	m68k: Switch to generic siginfo layout	2010-02-27 18:31:17 +01:00
signal.h
smp.h
socket.h	net: Generalize socket rx gap / receive queue overflow cmsg	2009-10-12 13:26:31 -07:00
sockios.h
spinlock.h
stat.h
statfs.h
string_mm.h
string_no.h
string.h
sun3_pgalloc.h
sun3_pgtable.h
sun3-head.h
sun3ints.h
sun3mmu.h
sun3x.h
sun3xflop.h
sun3xprom.h
swab.h	m68k: Fix asm/swab.h for ColdFire	2010-02-27 18:27:13 +01:00
system_mm.h
system_no.h
system.h
termbits.h
termios.h
thread_info_mm.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
thread_info_no.h	add descriptive comment for TIF_MEMDIE task flag declaration.	2010-05-14 11:13:27 +02:00
thread_info.h
timex.h	m68knommu: fix ColdFire definition of CLOCK_TICK_RATE	2009-09-16 09:43:56 +10:00
tlb.h
tlbflush.h
topology.h
traps_mm.h
traps_no.h
traps.h
types.h
uaccess_mm.h
uaccess_no.h
uaccess.h
ucontext.h	m68k: Define sigcontext ABI of ColdFire	2010-02-27 18:44:10 +01:00
unaligned.h
unistd.h	Add generic sys_ipc wrapper	2010-03-12 15:52:32 -08:00
user.h
virtconvert.h	m68k: Eliminate unused variable in page_to_phys()	2010-02-27 18:31:18 +01:00
xor.h
zorro.h