kernel-ark/include/asm-alpha
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
..
8253pit.h
a.out.h
agp_backend.h
agp.h
atomic.h
auxvec.h
barrier.h
bitops.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h
checksum.h
compiler.h
console.h
core_apecs.h
core_cia.h
core_irongate.h
core_lca.h
core_marvel.h
core_mcpcia.h
core_polaris.h
core_t2.h
core_titan.h
core_tsunami.h
core_wildfire.h
cputime.h
current.h
delay.h
div64.h
dma-mapping.h
dma.h
elf.h
emergency-restart.h
err_common.h
err_ev6.h
err_ev7.h
errno.h
fcntl.h
floppy.h
fpu.h
futex.h
gct.h
gentrap.h
hardirq.h
hw_irq.h
hwrpb.h
ide.h
io_trivial.h
io.h
ioctl.h
ioctls.h
ipcbuf.h
irq.h
jensen.h
kmap_types.h
linkage.h
local.h
machvec.h
mc146818rtc.h
md.h
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msgbuf.h
mutex.h
namei.h
page.h
pal.h
param.h
parport.h
pci.h
percpu.h
pgalloc.h
pgtable.h
poll.h
posix_types.h
processor.h
ptrace.h
reg.h
regdef.h
resource.h
rtc.h
rwsem.h
scatterlist.h
sections.h
segment.h
semaphore.h
sembuf.h
serial.h
setup.h
sfp-machine.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
smp.h Merge git://git.infradead.org/hdrcleanup-2.6 2006-06-20 15:10:08 -07:00
socket.h
sockios.h
spinlock_types.h
spinlock.h
stat.h
statfs.h
string.h
suspend.h
sysinfo.h
system.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
xor.h