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
..
dec
emma	MIPS: EMMA2RH: Remove emma2rh_sync on read operation	2008-10-27 16:18:30 +00:00
fw
ip32
lasat
mach-au1x00	MIPS: Alchemy: new userspace suspend interface for development boards.	2009-01-11 09:57:27 +00:00
mach-bcm47xx	MIPS: BCM47xx: Use the new SSB GPIO API	2008-10-15 12:46:50 +01:00
mach-cavium-octeon	MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.	2009-01-11 09:57:21 +00:00
mach-cobalt
mach-db1x00
mach-dec
mach-emma2rh
mach-excite
mach-generic	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-ip22	MIPS: IP22/28: Switch over to RTC class driver	2008-10-15 12:46:51 +01:00
mach-ip27	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-ip28	MIPS: IP22/28: Switch over to RTC class driver	2008-10-15 12:46:51 +01:00
mach-ip32	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-jazz	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-lasat
mach-lemote	MIPS: Adjust the dma-common.c platform hooks.	2009-01-11 09:57:24 +00:00
mach-malta
mach-mipssim
mach-pb1x00
mach-pnx833x	MIPS: Add support for NXP PNX833x (STB222/5) into linux kernel	2008-10-27 16:18:29 +00:00
mach-pnx8550
mach-rc32434	MIPS: RB532: Export rb532_gpio_set_func()	2009-01-30 21:33:01 +00:00
mach-rm
mach-sibyte
mach-tx39xx
mach-tx49xx	MIPS: RBTX4939: Add smc91x support	2008-10-27 16:18:27 +00:00
mach-vr41xx
mach-wrppmc
mach-yosemite
mips-boards
octeon	MIPS: Add Cavium OCTEON processor support files to arch/mips/cavium-octeon.	2009-01-11 09:57:21 +00:00
pci
pmc-sierra/msp71xx
sgi
sibyte
sn
txx9	MIPS: TXx9: Add support for TX4939 internal RTC	2009-01-30 21:32:58 +00:00
vr41xx
xtalk
abi.h
addrspace.h
asm.h
asmmacro-32.h
asmmacro-64.h
asmmacro.h	MIPS: Use EI/DI for MIPS R2.	2008-12-12 18:12:23 +00:00
atomic.h	MIPS: atomic_*(): Change type of intermediate variables.	2009-01-30 21:32:57 +00:00
auxvec.h
barrier.h
bcache.h
bitops.h	MIPS: Clean up MIPSxx-optimized bitop functions	2008-10-30 14:44:33 +00:00
bootinfo.h
branch.h
break.h	MIPS: Switch FPU emulator trap to BREAK instruction.	2008-10-30 14:44:34 +00:00
bug.h	MIPS: Make BUG() __noreturn.	2008-11-24 16:35:07 +00:00
bugs.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
cachectl.h
cacheflush.h
cacheops.h
cevt-r4k.h	MIPS: Have a heart for a lonely, lost header file ...	2008-10-15 12:46:49 +01:00
checksum.h
cmp.h
cmpxchg.h
compat-signal.h
compat.h	MIPS: compat: Implement is_compat_task.	2009-03-08 09:59:39 -07:00
compiler.h
cpu-features.h	MIPS: Hook Cavium OCTEON cache init into cache.c	2009-01-11 09:57:22 +00:00
cpu-info.h
cpu.h	MIPS: Add Cavium OCTEON processor constants and CPU probe.	2009-01-11 09:57:22 +00:00
cputime.h
current.h
debug.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
ds1287.h
dsp.h
edac.h
elf.h	MIPS: Fix preprocessor warnings flaged by GCC 4.4	2008-12-22 08:54:47 +00:00
emergency-restart.h
errno.h
fb.h
fcntl.h
fixmap.h
floppy.h
fpregdef.h
fpu_emulator.h	MIPS: Switch FPU emulator trap to BREAK instruction.	2008-10-30 14:44:34 +00:00
fpu.h
futex.h
gcmpregs.h
gic.h
gpio.h
gt64120.h
hardirq.h
hazards.h	MIPS: NEC VR5500 processor support fixup	2009-03-11 21:11:07 +01:00
highmem.h
hw_irq.h
i8253.h
i8259.h
ide.h
inst.h
io.h	MIPS: Modify core io.h macros to account for the Octeon Errata Core-301.	2009-01-11 09:57:22 +00:00
ioctl.h
ioctls.h
ipcbuf.h
irq_cpu.h
irq_gt641xx.h
irq_regs.h
irq.h	cpumask: make irq_set_affinity() take a const struct cpumask	2008-12-13 21:20:26 +10:30
irqflags.h
isadep.h
jazz.h
jazzdma.h
Kbuild	byteorder: make swab.h include asm/swab.h like a regular header	2009-01-14 19:56:50 -08:00
kdebug.h
kexec.h
kgdb.h
kmap_types.h
kspd.h
linkage.h
local.h
m48t37.h
mc146818-time.h	mips: use bcd2bin/bin2bcd	2008-10-20 08:52:41 -07:00
mc146818rtc.h
mips_mt.h
mipsmtregs.h
mipsprom.h
mipsregs.h	MIPS: Change {set,clear,change}_c0_<foo> to return old value.	2009-03-23 23:38:05 +01:00
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h	MIPS: Add Cavium OCTEON processor constants and CPU probe.	2009-01-11 09:57:22 +00:00
msc01_ic.h
msgbuf.h
mutex.h
nile4.h
paccess.h
page.h
param.h
parport.h
pci.h	MIPS: Better than nothing implementation of PCI mmap to fix X.	2008-12-09 21:55:43 +00:00
percpu.h
pgalloc.h
pgtable-32.h
pgtable-64.h
pgtable-bits.h
pgtable.h
pmon.h
poll.h
posix_types.h
prefetch.h	MIPS: NEC VR5500 processor support fixup	2009-03-11 21:11:07 +01:00
processor.h	MIPS: Add Cavium OCTEON cop2/cvmseg state entries to processor.h.	2009-01-11 09:57:22 +00:00
ptrace.h	MIPS: Fix a typo in watchpoint register structure.	2009-01-30 21:32:58 +00:00
r4k-timer.h
r4kcache.h
reboot.h
reg.h
regdef.h
resource.h
rm9k-ocd.h
rtlx.h
scatterlist.h
seccomp.h	MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled	2009-03-13 23:07:59 +01:00
sections.h
segment.h
sembuf.h
serial.h
setup.h
sgialib.h
sgiarcs.h
sgidefs.h
shmbuf.h
shmparam.h
sigcontext.h	headers_check fix: mips, sigcontext.h	2009-02-01 11:01:26 +05:30
siginfo.h
signal.h
sim.h
smp-ops.h
smp.h	MIPS: Add SMP_ICACHE_FLUSH for the Cavium CPU family.	2009-01-11 09:57:24 +00:00
smtc_ipi.h
smtc_proc.h
smtc.h
smvp.h
sni.h
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
sparsemem.h
spinlock_types.h
spinlock.h	x86: spinlocks: define dummy __raw_spin_is_contended	2009-02-09 08:15:39 -08:00
stackframe.h	MIPS: Cavium OCTEON multiplier state preservation.	2009-01-11 09:57:24 +00:00
stacktrace.h
stat.h
statfs.h
string.h
suspend.h
swab.h	headers_check fix: mips, swab.h	2009-02-01 11:01:27 +05:30
sysmips.h
system.h
termbits.h
termios.h	MIPS: Add return value checks to user_termio_to_kernel_termios()	2009-01-30 21:32:57 +00:00
thread_info.h	MIPS: Fix TIF_32BIT undefined problem when seccomp is disabled	2009-03-13 23:07:59 +01:00
time.h	MIPS: make cp0 counter clocksource/event usable as fallback.	2009-01-11 09:57:26 +00:00
timex.h
titan_dep.h
tlb.h
tlbdebug.h
tlbflush.h
topology.h
traps.h
txx9irq.h
txx9pio.h
txx9tmr.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h
user.h
vga.h
vpe.h
war.h
watch.h
wbflush.h
xor.h