David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/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>		2006-05-24 09:22:21 +01:00
..
arch-aaec2000	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
arch-at91rm9200	Merge master.kernel.org:/home/rmk/linux-2.6-arm	2006-04-02 13:34:00 -07:00
arch-cl7500	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-clps711x	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-ebsa110	[ARM] ebsa110: Fix incorrect serial port address	2006-04-07 13:23:48 +01:00
arch-ebsa285	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-ep93xx	[ARM] 3451/1: ep93xx: use the m48t86 rtc driver on the ts72xx platform	2006-04-02 16:17:40 +01:00
arch-h720x
arch-imx	[ARM] 3501/1: i.MX: fix lowlevel debug macros	2006-05-07 18:56:27 +01:00
arch-integrator	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-iop3xx	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-ixp4xx	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-06 19:59:18 +01:00
arch-ixp23xx	[ARM] 3459/1: ixp23xx: fix debug serial macros for big-endian operation	2006-04-09 22:20:57 +01:00
arch-ixp2000
arch-l7200	[ARM] Move FLUSH_BASE macros to asm/arch/memory.h	2006-04-07 13:22:21 +01:00
arch-lh7a40x	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-omap	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-pxa	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
arch-realview	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-rpc	[ARM] Move FLUSH_BASE macros to asm/arch/memory.h	2006-04-07 13:22:21 +01:00
arch-s3c2410	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-24 09:22:21 +01:00
arch-sa1100	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
arch-shark	[ARM] Move FLUSH_BASE macros to asm/arch/memory.h	2006-04-07 13:22:21 +01:00
arch-versatile
hardware	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mach	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
a.out.h
apm.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
assembler.h
atomic.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
auxvec.h
bitops.h
bug.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-06 19:59:18 +01:00
bugs.h
byteorder.h
cache.h
cacheflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
checksum.h
cpu-multi32.h
cpu-single.h
cpu.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
cputime.h
current.h
delay.h
div64.h
dma-mapping.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
dma.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
domain.h
ecard.h
elf.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
emergency-restart.h
errno.h
fcntl.h
fiq.h
floppy.h
fpstate.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
futex.h
glue.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
hardirq.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
hardware.h
ide.h
io.h
ioctl.h
ioctls.h
ipc.h
ipcbuf.h
irq.h
kmap_types.h
leds.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
limits.h
linkage.h
local.h
locks.h
mc146818rtc.h
memory.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
mman.h
mmu_context.h
mmu.h
mmzone.h
module.h
msgbuf.h
mtd-xip.h
mutex.h
namei.h
nwflash.h
page.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
param.h
parport.h
pci.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
percpu.h
pgalloc.h
pgtable-hwdef.h	[ARM] 3439/2: xsc3: add I/O coherency support	2006-04-02 00:07:39 +01:00
pgtable.h	[ARM] 3439/2: xsc3: add I/O coherency support	2006-04-02 00:07:39 +01:00
poll.h
posix_types.h
proc-fns.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
processor.h
procinfo.h	[ARM] 3517/1: move definition of PROC_INFO_SZ from procinfo.h to asm-offsets.h	2006-05-16 11:39:30 +01:00
ptrace.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
resource.h
rtc.h
scatterlist.h
sections.h
segment.h
semaphore-helper.h
semaphore.h
sembuf.h
serial.h
setup.h
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
sizes.h
smp.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
socket.h
sockios.h
spinlock_types.h
spinlock.h	[ARM] 3533/1: Implement the __raw_(read|write)_can_lock functions on ARM	2006-05-19 21:55:35 +01:00
stat.h
statfs.h
string.h
suspend.h
system.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
termbits.h
termios.h
therm.h
thread_info.h
timex.h
tlb.h
tlbflush.h	Don't include linux/config.h from anywhere else in include/	2006-04-26 12:56:16 +01:00
topology.h
traps.h
types.h
uaccess.h
ucontext.h
unaligned.h
unistd.h	Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6	2006-05-06 19:59:18 +01:00
user.h
vfp.h
vfpmacros.h	[ARM] 3472/1: Use the D variants of FLDMIA/FSTMIA on ARMv6	2006-04-10 21:32:42 +01:00
vga.h
xor.h