David S. Miller 17dce5dfe3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ...

Conflicts:

	net/mac80211/mlme.c

2008-09-08 16:59:05 -07:00

..

bitops

…

4level-fixup.h

…

atomic.h

…

audit_change_attr.h

…

audit_dir_write.h

…

audit_read.h

…

audit_signal.h

…

audit_write.h

…

bitops.h

…

bug.h

warn: Turn the netdev timeout WARN_ON() into a WARN()

2008-09-08 16:17:42 -07:00

cmpxchg-local.h

…

cmpxchg.h

…

cputime.h

…

device.h

…

div64.h

…

dma-coherent.h

…

dma-mapping-broken.h

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

dma-mapping.h

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

emergency-restart.h

…

errno-base.h

…

errno.h

…

fcntl.h

…

futex.h

…

gpio.h

gpio: fix build on CONFIG_GPIO_SYSFS=n

2008-07-28 16:30:21 -07:00

ide_iops.h

…

int-l64.h

…

int-ll64.h

asm-generic/int-ll64.h: always provide __{s,u}64

2008-07-25 10:53:27 -07:00

ioctl.h

Make ioctl.h compatible with userland

2008-08-12 16:07:31 -07:00

iomap.h

…

irq_regs.h

…

Kbuild

…

Kbuild.asm

Fix conditional export of kvh.h and a.out.h to userspace.

2008-09-05 15:44:31 +01:00

kdebug.h

…

libata-portmap.h

…

local.h

…

memory_model.h

…

mm_hooks.h

…

mman.h

…

mutex-dec.h

…

mutex-null.h

…

mutex-xchg.h

…

page.h

…

pci-dma-compat.h

dma-mapping: add the device argument to dma_mapping_error()

2008-07-26 12:00:03 -07:00

pci.h

…

percpu.h

…

pgtable-nopmd.h

include/asm-generic/pgtable-nopmd.h: macros are noxious, reason #435

2008-07-28 16:30:21 -07:00

pgtable-nopud.h

…

pgtable.h

mm: fix build on non-mmu machines

2008-07-15 13:58:40 -07:00

poll.h

…

resource.h

…

rtc.h

rtc: fix deadlock

2008-08-23 18:02:18 +02:00

sections.h

…

siginfo.h

…

signal.h

…

statfs.h

…

syscall.h

tracehook: comment pasto fixes

2008-09-05 14:39:38 -07:00

termios.h

…

tlb.h

…

topology.h

x86: change _node_to_cpumask_ptr to return const ptr

2008-07-13 19:11:58 +02:00

uaccess.h

…

vmlinux.lds.h

Missing symbol prefix on vmlinux.lds.h

2008-08-01 12:46:41 -07:00

xor.h

…