kernel_optimize_test/include/asm-um
Linus Torvalds cee4cca740 Merge git://git.infradead.org/hdrcleanup-2.6
* git://git.infradead.org/hdrcleanup-2.6: (63 commits)
  [S390] __FD_foo definitions.
  Switch to __s32 types in joystick.h instead of C99 types for consistency.
  Add <sys/types.h> to headers included for userspace in <linux/input.h>
  Move inclusion of <linux/compat.h> out of user scope in asm-x86_64/mtrr.h
  Remove struct fddi_statistics from user view in <linux/if_fddi.h>
  Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390
  Revert include/media changes: Mauro says those ioctls are only used in-kernel(!)
  Include <linux/types.h> and use __uXX types in <linux/cramfs_fs.h>
  Use __uXX types in <linux/i2o_dev.h>, include <linux/ioctl.h> too
  Remove private struct dx_hash_info from public view in <linux/ext3_fs.h>
  Include <linux/types.h> and use __uXX types in <linux/affs_hardblocks.h>
  Use __uXX types in <linux/divert.h> for struct divert_blk et al.
  Use __u32 for elf_addr_t in <asm-powerpc/elf.h>, not u32. It's user-visible.
  Remove PPP_FCS from user view in <linux/ppp_defs.h>, remove __P mess entirely
  Use __uXX types in user-visible structures in <linux/nbd.h>
  Don't use 'u32' in user-visible struct ip_conntrack_old_tuple.
  Use __uXX types for S390 DASD volume label definitions which are user-visible
  S390 BIODASDREADCMB ioctl should use __u64 not u64 type.
  Remove unneeded inclusion of <linux/time.h> from <linux/ufs_fs.h>
  Fix private integer types used in V4L2 ioctls.
  ...

Manually resolve conflict in include/linux/mtd/physmap.h
2006-06-20 15:10:08 -07:00
..
a.out.h
alternative.h
apic.h
archparam-i386.h
archparam-ppc.h
archparam-x86_64.h
atomic.h
auxvec.h
bitops.h
boot.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
calling.h
checksum.h
cobalt.h
common.lds.S
cpufeature.h
cputime.h
current.h
delay.h
desc.h
div64.h
dma-mapping.h
dma.h
dwarf2.h
elf-i386.h
elf-ppc.h
elf-x86_64.h
emergency-restart.h
errno.h
fcntl.h
fixmap.h
floppy.h
futex.h
hardirq.h
highmem.h
host_ldt-i386.h
host_ldt-x86_64.h
hw_irq.h
ide.h
io.h
ioctl.h
ioctls.h
ipc.h
ipcbuf.h
irq_vectors.h
irq.h
irqflags.h
keyboard.h
kmap_types.h
ldt.h
linkage.h
local.h
locks.h
mca_dma.h
mman.h
mmu_context.h
mmu.h
module-generic.h
module-i386.h
module-x86_64.h
msgbuf.h
mtrr.h
mutex.h
namei.h
page_offset.h
page.h
param.h
pci.h
pda.h
percpu.h
pgalloc.h
pgtable-2level.h
pgtable-3level.h
pgtable.h
poll.h
posix_types.h
prctl.h
processor-generic.h
processor-i386.h
processor-ppc.h
processor-x86_64.h
ptrace-generic.h
ptrace-i386.h
ptrace-x86_64.h
resource.h
rwlock.h
rwsem.h
scatterlist.h
sections.h
segment.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext-generic.h
sigcontext-i386.h
sigcontext-ppc.h
sigcontext-x86_64.h
siginfo.h
signal.h
smp.h
socket.h
sockios.h
spinlock_types.h
spinlock.h
stat.h
statfs.h
string.h
suspend.h
system-generic.h
system-i386.h
system-ppc.h
system-x86_64.h
termbits.h
termios.h
thread_info.h
timex.h
tlb.h
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h
user.h
vga.h
vm86.h
vm-flags-i386.h
vm-flags-x86_64.h
xor.h