Linus Torvalds ba1eb95cf3 Merge branch 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'header-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (50 commits) x86: headers cleanup - setup.h emu101k1.h: fix duplicate include of <linux/types.h> compiler-gcc4: conditionalize #error on __KERNEL__ remove __KERNEL_STRICT_NAMES make netfilter use strict integer types make drm headers use strict integer types make MTD headers use strict integer types make most exported headers use strict integer types make exported headers use strict posix types unconditionally include asm/types.h from linux/types.h make linux/types.h as assembly safe Neither asm/types.h nor linux/types.h is required for arch/ia64/include/asm/fpu.h headers_check fix cleanup: linux/reiserfs_fs.h headers_check fix cleanup: linux/nubus.h headers_check fix cleanup: linux/coda_psdev.h headers_check fix: x86, setup.h headers_check fix: x86, prctl.h headers_check fix: linux/reinserfs_fs.h headers_check fix: linux/socket.h headers_check fix: linux/nubus.h ... Manually fix trivial conflicts in: include/linux/netfilter/xt_limit.h include/linux/netfilter/xt_statistic.h		2009-03-26 16:11:41 -07:00
..
atomic.h	atomic_t: unify all arch definitions	2009-01-06 15:59:10 -08:00
auxvec.h
ax88796.h
bitops.h	frv: define __fls	2009-01-03 16:14:05 +10:30
bug.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
bugs.h
busctl-regs.h
byteorder.h	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
cache.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cacheflush.h	include/asm-frv/: Spelling fixes	2008-02-03 17:34:55 +02:00
checksum.h	FRV: ip_fast_csum() requires a memory clobber on its inline asm	2008-06-05 10:31:21 -07:00
cpu-irqs.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
cpumask.h
cputime.h
current.h
delay.h
device.h	Driver core: add dev_archdata to struct device	2006-12-01 14:52:01 -08:00
div64.h
dm9000.h
dma-mapping.h	dma-mapping: add the device argument to dma_mapping_error()	2008-07-26 12:00:03 -07:00
dma.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
elf.h	[PATCH] remove unused ibcs2/PER_SVR4 in SET_PERSONALITY	2008-10-16 15:40:05 +02:00
emergency-restart.h
errno.h
fb.h	fbdev: detect primary display device	2007-07-17 10:23:11 -07:00
fcntl.h
fpu.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
gdb-stub.h	[PATCH] FRV: Introduce asm-offsets for FRV arch	2006-07-10 13:24:22 -07:00
gpio-regs.h
hardirq.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
highmem.h	move frv docs one level up	2008-02-03 15:54:28 +02:00
hw_irq.h
init.h
io.h	FRV: Provide ioremap_wc() for FRV	2008-08-20 13:19:52 -07:00
ioctl.h	[PATCH] Generic ioctl.h	2006-01-10 08:01:34 -08:00
ioctls.h	termios: Termios defines for other platforms	2008-07-20 17:12:38 -07:00
ipcbuf.h
irc-regs.h
irq_regs.h	IRQ: Maintain regs pointer globally rather than passing to IRQ handlers	2006-10-05 15:10:12 +01:00
irq.h	frv: Remove bogus NO_IRQ = -1 define	2007-11-09 15:11:44 -08:00
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h	move die notifier handling to common code	2007-05-08 11:15:04 -07:00
kmap_types.h
linkage.h
local.h
math-emu.h
mb86943a.h	FRV: Enable the MB86943 PCI arbiter correctly	2007-08-01 20:48:17 -07:00
mb93091-fpga-irqs.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
mb93093-fpga-irqs.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
mb93493-irqs.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
mb93493-regs.h	[PATCH] FRV: Use the generic IRQ stuff	2006-09-26 08:48:53 -07:00
mb-regs.h	[PATCH] frv: basic __iomem annotations	2006-06-23 07:42:54 -07:00
mc146818rtc.h	[PATCH] frv: miscellaneous changes	2006-01-08 20:13:38 -08:00
mem-layout.h	Fix FRV minimum slab/kmalloc alignment	2008-05-28 09:05:28 -07:00
mman.h	[PATCH] add asm-generic/mman.h	2006-02-15 15:32:22 -08:00
mmu_context.h	[PATCH] x86: PARAVIRT: add hooks to intercept mm creation and destruction	2007-05-02 19:27:14 +02:00
mmu.h	NOMMU: Make VMAs per MM as for MMU-mode linux	2009-01-08 12:04:47 +00:00
module.h	[PATCH] frv: add module support stubs	2006-01-08 20:13:37 -08:00
msgbuf.h
mutex.h	[PATCH] mutex subsystem, add default include/asm-*/mutex.h files	2006-01-09 15:59:19 -08:00
page.h	PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures	2008-07-24 10:47:21 -07:00
param.h	avoid overflows in kernel/time.c	2008-02-08 09:22:39 -08:00
pci.h	PCI: remove pci_dac_dma_... APIs	2007-07-11 16:02:11 -07:00
percpu.h
pgalloc.h	CONFIG_HIGHPTE vs. sub-page page tables.	2008-02-08 09:22:42 -08:00
pgtable.h	FRV: __pte_to_swp_entry doesn't expand correctly	2009-02-17 14:05:30 -08:00
poll.h	Consolidate asm/poll.h	2007-05-11 08:29:34 -07:00
posix_types.h	asm-*/posix_types.h: scrub __GLIBC__	2008-02-08 09:22:34 -08:00
processor.h	[PATCH] Make cpu_relax() imply barrier() on all arches	2006-07-12 12:56:45 -07:00
ptrace.h	[PATCH] fix frv headers_check	2007-02-01 16:17:05 -08:00
registers.h	[PATCH] FRV: Introduce asm-offsets for FRV arch	2006-07-10 13:24:22 -07:00
resource.h
scatterlist.h	FRV: move DMA macros to scatterlist.h for consistency.	2008-02-05 09:44:20 -08:00
sections.h
segment.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
sembuf.h
serial-regs.h
serial.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
setup.h	[PATCH] cleanup asm/setup.h userspace visibility	2006-12-07 08:39:46 -08:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h	[PATCH] irq-flags: FRV: Use the new IRQF_ constants	2006-07-02 13:58:46 -07:00
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
socket.h	net: new user space API for time stamping of incoming and outgoing packets	2009-02-15 22:43:33 -08:00
sockios.h	[NET]: Introduce SIOCGSTAMPNS ioctl to get timestamps with nanosec resolution	2007-04-25 22:24:04 -07:00
spinlock.h
spr-regs.h	FRV: Add support for emulation of userspace atomic ops [try #2]	2008-04-10 13:41:29 -07:00
stat.h
statfs.h
string.h
suspend.h
swab.h	headers_check fix: frv, swab.h	2009-02-01 11:01:23 +05:30
system.h	frv: fix irqs_disabled() to return an int, not an unsigned long	2008-07-12 14:33:42 -07:00
termbits.h	termios: Termios defines for other platforms	2008-07-20 17:12:38 -07:00
termios.h	[PATCH] consolidate line discipline number definitions	2007-02-11 10:51:26 -08:00
thread_info.h	clean up duplicated alloc/free_thread_info	2008-07-25 10:53:28 -07:00
timer-regs.h
timex.h	[PATCH] ntp: cleanup defines and comments	2006-10-01 00:39:27 -07:00
tlb.h	FRV: Replace pgd management via slabs through quicklists	2007-05-09 12:30:46 -07:00
tlbflush.h	remove unused flush_tlb_pgtables	2007-10-19 11:53:34 -07:00
topology.h	asm-generic: add node_to_cpumask_ptr macro	2008-04-19 19:44:58 +02:00
types.h	frv: types: use <asm-generic/int-*.h> for the frv architecture	2008-05-02 16:18:20 -07:00
uaccess.h	frv: missing __clear_user()	2007-07-15 16:40:52 -07:00
ucontext.h
unaligned.h	FRV: Switch unaligned access to the packed-struct implementation	2008-10-16 15:06:54 -07:00
unistd.h	FRV: Wire up new system calls	2008-08-01 13:03:49 -07:00
user.h
vga.h	[PATCH] frv: miscellaneous changes	2006-01-08 20:13:38 -08:00
virtconvert.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
xor.h	[PATCH] frv: miscellaneous changes	2006-01-08 20:13:38 -08:00