| #
8cedcfd4 |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
7211bb9b |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
87199134 |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
328198ac |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
c2cc87ca |
| 05-Nov-2005 |
Jeff Garzik <jgarzik@pobox.com> |
Merge branch 'master'
|
| #
c7fb577e |
| 31-Oct-2005 |
Tony Luck <tony.luck@intel.com> |
manual update from upstream:
Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c
Signed-off-by: Tony Luck <tony.luck@intel.com>
|
| #
53b2ec55 |
| 31-Oct-2005 |
Steve French <sfrench@us.ibm.com> |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
|
| #
1f04c0a2 |
| 31-Oct-2005 |
Anton Altaparmakov <aia21@cantab.net> |
Merge branch 'master' of /usr/src/ntfs-2.6/
|
|
Revision tags: v2.6.14 |
|
| #
f9bd170a |
| 26-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
powerpc: Merge i8259.c into arch/powerpc/sysdev
This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an i
powerpc: Merge i8259.c into arch/powerpc/sysdev
This changes the parameters for i8259_init so that it takes two
parameters: a physical address for generating an interrupt
acknowledge cycle, and an interrupt number offset. i8259_init
now sets the irq_desc[] for its interrupts; all the callers
were doing this, and that code is gone now. This also defines
a CONFIG_PPC_I8259 symbol to select i8259.o for inclusion, and
makes the platforms that need it select that symbol.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
| #
25635c71 |
| 26-Oct-2005 |
Paul Mackerras <paulus@samba.org> |
ppc: Use the indirect_pci.c from arch/powerpc/sysdev
This defines a CONFIG_INDIRECT_PCI symbol to control whether it
gets used or not, and fixes the Kconfig to select that symbol for
platforms that
ppc: Use the indirect_pci.c from arch/powerpc/sysdev
This defines a CONFIG_INDIRECT_PCI symbol to control whether it
gets used or not, and fixes the Kconfig to select that symbol for
platforms that need it.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|
|
Revision tags: v2.6.14-rc5, v2.6.14-rc4, v2.6.14-rc3 |
|
| #
bbeb3f4c |
| 27-Sep-2005 |
Stephen Rothwell <sfr@canb.auug.org.au> |
powerpc: clean up after powermac build merge
Complete moving arch/ppc64/kernel/mpic.h,
include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
and include/asm-ppc64/kprobes.h
Add arch/pow
powerpc: clean up after powermac build merge
Complete moving arch/ppc64/kernel/mpic.h,
include/asm-ppc/reg.h, include/asm-ppc64/kdebug.h
and include/asm-ppc64/kprobes.h
Add arch/powerpc/platforms/Makefile and use it from
arch/powerpc/Makefile
Introduce OLDARCH temporarily so we can point back to
the originating architecture
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
show more ...
|
| #
14cf11af |
| 26-Sep-2005 |
Paul Mackerras <paulus@samba.org> |
powerpc: Merge enough to start building in arch/powerpc.
This creates the directory structure under arch/powerpc and a bunch
of Kconfig files. It does a first-cut merge of arch/powerpc/mm,
arch/pow
powerpc: Merge enough to start building in arch/powerpc.
This creates the directory structure under arch/powerpc and a bunch
of Kconfig files. It does a first-cut merge of arch/powerpc/mm,
arch/powerpc/lib and arch/powerpc/platforms/powermac. This is enough
to build a 32-bit powermac kernel with ARCH=powerpc.
For now we are getting some unmerged files from arch/ppc/kernel and
arch/ppc/syslib, or arch/ppc64/kernel. This makes some minor changes
to files in those directories and files outside arch/powerpc.
The boot directory is still not merged. That's going to be interesting.
Signed-off-by: Paul Mackerras <paulus@samba.org>
show more ...
|