Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
commit66643de455c27973ac31ad6de9f859d399916842
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 24 May 2006 08:22:21 +0000 (24 09:22 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Wed, 24 May 2006 08:22:21 +0000 (24 09:22 +0100)
tree7ebed7f051879007d4b11d6aaa9e65a1bcb0b08f
parent2c23d62abb820e19c54012520f08a198c2233a85
parent387e2b0439026aa738a9edca15a57e5c0bcb4dfc
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:

include/asm-powerpc/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/unistd.h

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
18 files changed:
include/asm-i386/io_apic.h
include/asm-powerpc/unistd.h
include/asm-ppc/page.h
include/asm-s390/unistd.h
include/asm-sparc/unistd.h
include/asm-sparc64/dma-mapping.h
include/asm-sparc64/unistd.h
include/asm-x86_64/io_apic.h
include/linux/device.h
include/linux/fs.h
include/linux/mmzone.h
include/linux/netdevice.h
include/linux/serial_core.h
include/linux/slab.h
include/linux/swap.h
include/linux/syscalls.h
include/net/irda/irlmp.h
include/net/sctp/sctp.h