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
..
bitops	[PATCH] bitops: generic minix_{test,set,test_and_clear,test,find_first_zero}_bit()	2006-03-26 08:57:11 -08:00
4level-fixup.h
atomic.h
bitops.h	[PATCH] bitops: update include/asm-generic/bitops.h	2006-03-26 08:57:15 -08:00
bug.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cputime.h
div64.h
dma-mapping-broken.h
dma-mapping.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
emergency-restart.h
errno-base.h
errno.h
fcntl.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
futex.h	[PATCH] lightweight robust futexes updates	2006-03-27 08:44:49 -08:00
ide_iops.h
ioctl.h
iomap.h
ipc.h
local.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
memory_model.h	[PATCH] remove zone_mem_map	2006-03-27 08:44:47 -08:00
mman.h
mutex-dec.h	[PATCH] mutex: some cleanups	2006-03-31 12:19:01 -08:00
mutex-null.h
mutex-xchg.h	[PATCH] mutex: some cleanups	2006-03-31 12:19:01 -08:00
page.h
pci-dma-compat.h
pci.h
percpu.h	[PATCH] for_each_possible_cpu: fixes for generic part	2006-03-28 09:16:05 -08:00
pgtable-nopmd.h
pgtable-nopud.h
pgtable.h	[SPARC64]: Fix D-cache corruption in mremap	2006-06-01 17:47:25 -07:00
resource.h
rtc.h
sections.h
siginfo.h
signal.h	Add standard include guard to asm-generic/signal and use compiler.h	2006-04-27 06:57:23 +01:00
statfs.h
termios.h
tlb.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
topology.h
uaccess.h
unaligned.h
vmlinux.lds.h
xor.h