linux/arch
Linus Torvalds ef93127e4c Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SERIAL] sunsu: Fix section mismatch warnings.
  [SPARC64]: pgtable_cache_init() should be __init.
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/prom.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/pci.c
  [SPARC64]: Fix section mismatch warnings in arch/sparc64/kernel/console.c
  [MM]: sparse_init() should be __init.
  [SPARC64]: Update defconfig.
  [VIDEO]: Add Sun XVR-2500 framebuffer driver.
  [VIDEO]: Add Sun XVR-500 framebuffer driver.
  [SPARC64]: SUN4U PCI-E controller support.
  [SPARC]: Fix comment typo in smp4m_blackbox_current().
  [SCSI] SUNESP: sun_esp.c needs linux/delay.h

Fix up conflict in arch/sparc64/mm/init.c manually due to removal of
pgtable_cache_init() through the -mm patches (even though that patch was
also by David ;)

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-07 12:22:48 -07:00
..
alpha srmcons: fix kmalloc(GFP_KERNEL) inside spinlock 2007-05-07 12:12:58 -07:00
arm get_unmapped_area handles MAP_FIXED on arm 2007-05-07 12:12:56 -07:00
arm26 ARM26: remove useless config option GENERIC_BUST_SPINLOCK. 2007-05-07 12:12:58 -07:00
avr32 AVR32: Remove useless config option "GENERIC_BUST_SPINLOCK". 2007-04-27 13:45:26 +02:00
blackfin blackfin architecture 2007-05-07 12:12:58 -07:00
cris CRIS: remove code related to pre-2.2 kernel 2007-05-07 12:13:00 -07:00
frv get_unmapped_area handles MAP_FIXED on frv 2007-05-07 12:12:56 -07:00
h8300 h8300: add zImage support 2007-05-07 12:12:58 -07:00
i386 get_unmapped_area handles MAP_FIXED on i386 2007-05-07 12:12:56 -07:00
ia64 get_unmapped_area handles MAP_FIXED on ia64 2007-05-07 12:12:56 -07:00
m32r [PATCH] x86: Allow percpu variables to be page-aligned 2007-05-02 19:27:12 +02:00
m68k SPIN_LOCK_UNLOCKED cleanup in arch/m68k 2007-05-07 12:12:59 -07:00
m68knommu PCI: Cleanup the includes of <linux/pci.h> 2007-05-02 19:02:35 -07:00
mips RM9000 serial driver 2007-05-07 12:12:50 -07:00
parisc get_unmapped_area handles MAP_FIXED on parisc 2007-05-07 12:12:56 -07:00
powerpc slab allocators: Remove SLAB_DEBUG_INITIAL flag 2007-05-07 12:12:57 -07:00
ppc Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 2007-05-05 14:55:20 -07:00
s390 Introduce CONFIG_HAS_DMA 2007-05-07 12:12:51 -07:00
sh sh: R7785RP board updates. 2007-05-07 02:11:57 +00:00
sh64 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 2007-05-05 14:55:20 -07:00
sparc [SPARC]: Fix comment typo in smp4m_blackbox_current(). 2007-05-06 22:43:46 -07:00
sparc64 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 2007-05-07 12:22:48 -07:00
um uml: fix prototypes 2007-05-07 12:13:04 -07:00
v850 v850: generic timekeeping conversion 2007-05-07 12:13:04 -07:00
x86_64 swsusp: do not use page flags 2007-05-07 12:12:59 -07:00
xtensa xtensa: strlcpy is smart enough 2007-05-07 12:13:04 -07:00