kevin/linux
1
Fork 0
Code
00cb473905
linux/include/asm-m68k
History
Linus Torvalds ea62ccd00f Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 
* 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: (231 commits)
  [PATCH] i386: Don't delete cpu_devs data to identify different x86 types in late_initcall
  [PATCH] i386: type may be unused
  [PATCH] i386: Some additional chipset register values validation.
  [PATCH] i386: Add missing !X86_PAE dependincy to the 2G/2G split.
  [PATCH] x86-64: Don't exclude asm-offsets.c in Documentation/dontdiff
  [PATCH] i386: avoid redundant preempt_disable in __unlazy_fpu
  [PATCH] i386: white space fixes in i387.h
  [PATCH] i386: Drop noisy e820 debugging printks
  [PATCH] x86-64: Fix allnoconfig error in genapic_flat.c
  [PATCH] x86-64: Shut up warnings for vfat compat ioctls on other file systems
  [PATCH] x86-64: Share identical video.S between i386 and x86-64
  [PATCH] x86-64: Remove CONFIG_REORDER
  [PATCH] x86-64: Print type and size correctly for unknown compat ioctls
  [PATCH] i386: Remove copy_*_user BUG_ONs for (size < 0)
  [PATCH] i386: Little cleanups in smpboot.c
  [PATCH] x86-64: Don't enable NUMA for a single node in K8 NUMA scanning
  [PATCH] x86: Use RDTSCP for synchronous get_cycles if possible
  [PATCH] i386: Add X86_FEATURE_RDTSCP
  [PATCH] i386: Implement X86_FEATURE_SYNC_RDTSC on i386
  [PATCH] i386: Implement alternative_io for i386
  ...

Fix up trivial conflict in include/linux/highmem.h manually.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-05 14:55:20 -07:00
..
a.out.h
adb_iop.h
amigahw.h [PATCH] m68k: namespace pollution fix (custom->amiga_custom) 2006-01-12 09:09:00 -08:00
amigaints.h [PATCH] m68k: convert amiga irq code 2006-06-25 10:00:57 -07:00
amigayle.h
amipcmcia.h
apollodma.h
apollohw.h [PATCH] m68k: convert apollo irq code 2006-06-25 10:00:57 -07:00
atafd.h
atafdreg.h
atari_acsi.h
atari_joystick.h
atari_SLM.h
atari_stdma.h IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
atari_stram.h
atarihw.h
atariints.h [PATCH] m68k: cleanup generic irq names 2006-06-25 10:00:57 -07:00
atarikb.h m68k: Atari keyboard and mouse support. 2007-05-04 17:59:05 -07:00
atomic.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
auxvec.h [PATCH] auxiliary vector cleanups 2005-09-07 16:57:21 -07:00
bitops.h [PATCH] m68k: fix undefined reference to generic_find_next_zero_le_bit 2006-03-26 08:57:13 -08:00
blinken.h
bootinfo.h
bug.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
bugs.h
bvme6000hw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
byteorder.h
cache.h [PATCH] Kill L1_CACHE_SHIFT_MAX 2006-01-08 20:13:39 -08:00
cachectl.h
cacheflush.h [PATCH] Optimize D-cache alias handling on fork 2006-12-13 09:27:08 -08:00
checksum.h [NET]: M68K checksum annotations and cleanups. 2006-12-02 21:23:07 -08:00
contregs.h
cputime.h
current.h
delay.h
device.h Driver core: add dev_archdata to struct device 2006-12-01 14:52:01 -08:00
div64.h [NET]: div64_64 consolidate (rev3) 2007-04-25 22:23:33 -07:00
dma-mapping.h [PATCH] m68k dma-mapping: gfp_t annotations 2007-03-14 15:27:51 -07:00
dma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
dsp56k.h [PATCH] m68k: dsp56k __user annotations 2006-01-12 09:09:04 -08:00
dvma.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
elf.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
emergency-restart.h [PATCH] Add emergency_restart() 2005-07-26 14:35:41 -07:00
entry.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
errno.h
fbio.h
fcntl.h [PATCH] Clean up struct flock64 definitions 2005-09-07 16:57:38 -07:00
floppy.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
fpu.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
futex.h [PATCH] consolidate asm/futex.h 2006-01-08 20:13:39 -08:00
hardirq.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
hp300hw.h
hw_irq.h
hwtest.h
ide.h IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
idprom.h
intersil.h
io.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
ioctl.h [PATCH] Generic ioctl.h 2006-01-10 08:01:34 -08:00
ioctls.h
ipc.h
ipcbuf.h
irq_regs.h [PATCH] m68k pt_regs fixes, part 2 2006-10-08 12:32:35 -07:00
irq.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
Kbuild Add empty Kbuild files for 'make headers_install' in remaining arches. 2006-06-18 12:58:53 +01:00
kmap_types.h
linkage.h
local.h
mac_asc.h
mac_baboon.h
mac_iop.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
mac_mouse.h
mac_oss.h [PATCH] m68k: convert mac irq code 2006-06-25 10:00:58 -07:00
mac_psc.h
mac_via.h
machdep.h IRQ: Use the new typedef for interrupt handler function pointers 2006-10-09 12:19:47 +01:00
machines.h
machw.h
macintosh.h [PATCH] m68k: convert mac irq code 2006-06-25 10:00:58 -07:00
macints.h [PATCH] m68k: convert mac irq code 2006-06-25 10:00:58 -07:00
math-emu.h [PATCH] m68k: work around binutils tokenizer change 2007-02-11 10:51:20 -08:00
mc146818rtc.h [PATCH] rtc-cmos needs RTC_ALWAYS_BCD known 2007-03-14 15:27:49 -07:00
md.h
mman.h [PATCH] add asm-generic/mman.h 2006-02-15 15:32:22 -08:00
mmu_context.h [PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction 2007-05-02 19:27:14 +02:00
mmu.h
module.h
motorola_pgalloc.h
motorola_pgtable.h [PATCH] Standardize pxx_page macros 2006-09-26 08:48:51 -07:00
movs.h
msgbuf.h
mutex.h [PATCH] mutex subsystem, add default include/asm-*/mutex.h files 2006-01-09 15:59:19 -08:00
mvme16xhw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
mvme147hw.h [PATCH] m68k: convert VME irq code 2006-06-25 10:00:58 -07:00
namei.h
nubus.h
openprom.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
oplib.h [SPARC]: Kill prom_getname, unused and not implemented properly. 2006-07-21 14:17:55 -07:00
page_offset.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
page.h [PATCH] Fix 'make headers_check' on ia64 2006-09-19 07:59:59 -07:00
param.h
parport.h
pci.h
percpu.h
pgalloc.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
pgtable.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
poll.h [PATCH] POLLRDHUP/EPOLLRDHUP handling for half-closed devices notifications 2006-03-25 08:22:56 -08:00
posix_types.h
processor.h [PATCH] m68k: use c99 initializer 2006-06-23 07:43:00 -07:00
ptrace.h
q40_master.h
q40ints.h
raw_io.h [PATCH] iomap_copy fallout (m68k) 2006-02-18 16:30:40 -05:00
resource.h
rtc.h fix file specification in comments 2006-10-03 23:01:26 +02:00
sbus.h
scatterlist.h [PATCH] m68k: Add the generic dma API functions 2006-06-25 10:00:56 -07:00
sections.h
segment.h
semaphore-helper.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
semaphore.h [PATCH] semaphore: Remove __MUTEX_INITIALIZER() 2005-10-30 17:37:27 -08:00
sembuf.h
serial.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
setup.h [PATCH] cleanup asm/setup.h userspace visibility 2006-12-07 08:39:46 -08:00
shm.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h [PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) 2006-10-08 12:32:36 -07:00
socket.h [NET]: Adding SO_TIMESTAMPNS / SCM_TIMESTAMPNS support 2007-04-25 22:24:21 -07:00
sockios.h [NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution 2007-04-25 22:24:04 -07:00
spinlock.h
stat.h [PATCH] 2TB files: st_blocks is invalid when calling stat64 2006-03-26 08:57:00 -08:00
statfs.h
string.h [PATCH] m68k: cleanup string functions 2006-10-06 08:53:40 -07:00
sun3_pgalloc.h
sun3_pgtable.h [PATCH] m68k: bogus function argument types (sun3_pgtable.h) 2006-01-12 09:09:01 -08:00
sun3-head.h [PATCH] Sun3: General updates 2006-12-09 09:41:18 -08:00
sun3ints.h [PATCH] Sun3: General updates 2006-12-09 09:41:18 -08:00
sun3mmu.h [PATCH] sun3_ioremap() prototype 2006-10-15 11:00:58 -07:00
sun3x.h
sun3xflop.h [PATCH] m68k pt_regs fixes 2006-10-07 10:51:14 -07:00
sun3xprom.h
suspend.h
system.h [PATCH] m68k: small system.h cleanup 2006-10-06 08:53:41 -07:00
termbits.h [PATCH] tty: preparatory structures for termios revamp 2006-12-08 08:28:56 -08:00
termios.h [PATCH] consolidate line discipline number definitions 2007-02-11 10:51:26 -08:00
thread_info.h [PATCH] missing helper - task_stack_page() 2006-01-12 09:08:50 -08:00
timex.h
tlb.h
tlbflush.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
topology.h
traps.h [PATCH] m68k: convert generic irq code to irq controller 2006-06-25 10:00:57 -07:00
types.h [PATCH] sab: consolidate kmem_bufctl_t 2005-09-05 00:05:48 -07:00
uaccess.h [PATCH] m68k: uaccess.h needs sched.h 2007-01-30 08:26:45 -08:00
ucontext.h
unaligned.h
unistd.h [PATCH] remove kernel syscalls 2006-12-07 08:39:37 -08:00
user.h [PATCH] m68k: don't include asm-m68k/page.h in asm-m68k/user.h 2007-02-11 10:51:20 -08:00
virtconvert.h Don't include linux/config.h from anywhere else in include/ 2006-04-26 12:56:16 +01:00
xor.h
zorro.h [PATCH] m68k: basic iomem annotations 2006-01-12 09:09:02 -08:00