You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		19 years ago
..
bbm.h	…
blktrans.h	…
cfi.h	…
cfi_endian.h	…
compatmac.h	…
concat.h	…
doc2000.h	…
flashchip.h	…
ftl.h	…
gen_probe.h	…
iflash.h	…
inftl.h	[MTD] NAND Replace oobinfo by ecclayout	19 years ago
jedec.h	…
map.h	…
mtd.h	Merge git://git.infradead.org/hdrcleanup-2.6	19 years ago
nand.h	Merge git://git.infradead.org/hdrcleanup-2.6	19 years ago
nand_ecc.h	…
ndfc.h	[MTD] NAND Fix platform structure and NDFC driver	19 years ago
nftl.h	[MTD] NAND Replace oobinfo by ecclayout	19 years ago
onenand.h	[MTD] NAND Replace oobinfo by ecclayout	19 years ago
onenand_regs.h	…
partitions.h	[MTD] NAND Replace oobinfo by ecclayout	19 years ago
physmap.h	…
plat-ram.h	…
pmc551.h	…
xip.h	…