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
..
sn0	Merge git://git.infradead.org/hdrcleanup-2.6	2006-06-20 15:10:08 -07:00
addrs.h	Merge git://git.infradead.org/hdrcleanup-2.6	2006-06-20 15:10:08 -07:00
agent.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
fru.h	[MIPS] SN: Move FRU header one level up; it is not SN0-specific.	2006-06-19 17:39:22 +01:00
gda.h
hub.h
intr.h
io.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
ioc3.h
klconfig.h	Merge git://git.infradead.org/hdrcleanup-2.6	2006-06-20 15:10:08 -07:00
kldir.h	Merge git://git.infradead.org/hdrcleanup-2.6	2006-06-20 15:10:08 -07:00
klkernvars.h
launch.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mapped_kernel.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
nmi.h
sn_private.h
types.h