Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 May 2006 18:59:18 +0000 (19:59 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 May 2006 18:59:18 +0000 (19:59 +0100)
commit5047f09b56d0bc3c21aec9cb16de60283da645c6
tree09a07554b933c3bb912ce3bfc0ea7c7e1f16041c
parentc0f1fe00c3923135b2c2f443448585482da8a53e
parent5528e568a760442e0ec8fd2dea1f0791875a066b
Merge git://git./linux/kernel/git/torvalds/linux-2.6

Signed-off-by: David Woodhouse <dwmw2@infradead.org>
12 files changed:
include/asm-arm/bug.h
include/asm-arm/unistd.h
include/asm-powerpc/spu.h
include/asm-powerpc/topology.h
include/asm-ppc/commproc.h
include/asm-sparc/unistd.h
include/asm-sparc64/tlbflush.h
include/asm-sparc64/unistd.h
include/linux/audit.h
include/net/ax25.h
include/net/inet_timewait_sock.h
include/net/sock.h