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
..
2007-03-27 08:52:47 +02:00
2007-05-07 12:12:52 -07:00
2006-12-22 08:55:49 -08:00
2007-05-07 12:12:54 -07:00
2007-05-07 12:12:54 -07:00
2007-05-07 12:12:54 -07:00
2007-01-11 18:18:20 -08:00
2007-02-15 09:57:03 -08:00
2006-12-07 08:39:22 -08:00
2006-09-26 08:48:45 -07:00
2007-05-07 12:12:55 -07:00
2005-04-16 15:20:36 -07:00
2007-05-07 12:12:54 -07:00
2007-05-07 12:12:52 -07:00
2007-05-06 23:54:25 -07:00