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

..

8xx_immap.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

amigahw.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

amigaints.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

amigappc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

amigayle.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

amipcmcia.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ans-lcd.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

bootinfo.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

bootx.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

btext.h

[PATCH] powerpc: Unify udbg (#2)

2006-01-09 14:49:54 +11:00

commproc.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2006-05-06 19:59:18 +01:00

cpm2.h

[PATCH] ppc32 CPM_UART: Fixed break send on SCC

2006-05-03 23:06:43 +10:00

delay.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

floppy.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

gg2.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

gt64260_defs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

gt64260.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

harrier.h

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

hawk_defs.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hawk.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

highmem.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

hydra.h

[PATCH] ppc trivial iomem annotations: chrp

2005-04-24 14:58:08 -07:00

ibm4xx.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ibm44x.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ibm403.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ibm405.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ibm_ocp_pci.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ibm_ocp.h

[PATCH] ppc32: remove "jumbo" member from ocp_func_emac_data

2006-01-06 08:33:30 -08:00

immap_85xx.h

[PATCH] Update email address for Kumar

2005-11-13 18:14:10 -08:00

immap_cpm2.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

io.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

kgdb.h

[PATCH] ppc: Fix ARCH=ppc build with xmon

2005-11-08 11:19:48 +11:00

m48t35.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

m8260_pci.h

[PATCH] ppc32: Support for 82xx PQII on-chip PCI bridge

2005-05-28 16:46:15 -07:00

machdep.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

md.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mk48t59.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mmu_context.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mmu.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mpc8xx.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mpc10x.h

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

mpc52xx_psc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mpc52xx.h

[PATCH] ppc32: Reorganize and complete MPC52xx initial cpu setup

2006-03-27 14:49:00 +11:00

mpc83xx.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mpc85xx.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mpc8260_pci9.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

mpc8260.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

mv64x60_defs.h

[PATCH] ppc32: mv64x60 updates & enhancements

2005-09-05 00:06:00 -07:00

mv64x60.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ocp_ids.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ocp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

open_pic.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

page.h

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

pc_serial.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pci-bridge.h

[PATCH] powerpc: pci_address_to_pio fix

2006-01-09 15:05:56 +11:00

pci.h

[PATCH] ppc: make phys_mem_access_prot() work with pfns instead of addresses

2005-10-29 14:25:49 +10:00

pgalloc.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pgtable.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

pnp.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

ppc4xx_dma.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ppc4xx_pic.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

ppc_sys.h

[PATCH] ppc32: odd fixes and improvements in ppc_sys

2006-04-28 21:05:16 +10:00

ppcboot.h

[PATCH] ppc32: cleanup AMCC PPC40x eval boards to support U-Boot

2005-11-07 07:53:26 -08:00

prep_nvram.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

prom.h

ppc: Remove CHRP, POWER3 and POWER4 support from arch/ppc

2006-03-28 10:22:10 +11:00

raven.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

reg_booke.h

[PATCH] ppc32: add 440GX erratum 440_43 workaround

2006-04-28 21:04:56 +10:00

residual.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rheap.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

rio.h

[PATCH] RapidIO support: ppc32

2005-11-07 07:53:47 -08:00

rtc.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

serial.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

smp.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

spinlock.h

[PATCH] powerpc: Fix building of power3 config on ppc32

2005-09-25 22:38:45 +10:00

suspend.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

system.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge

2006-01-12 10:21:22 -08:00

time.h

Don't include linux/config.h from anywhere else in include/

2006-04-26 12:56:16 +01:00

todc.h

[PATCH] powerpc: trivial: modify comments to refer to new location of files

2006-02-10 16:53:51 +11:00

traps.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

zorro.h

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00