kernel-ark/drivers/video/riva
Linus Torvalds df6d3916f3 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: (77 commits)
  [POWERPC] Abolish powerpc_flash_init()
  [POWERPC] Early serial debug support for PPC44x
  [POWERPC] Support for the Ebony 440GP reference board in arch/powerpc
  [POWERPC] Add device tree for Ebony
  [POWERPC] Add powerpc/platforms/44x, disable platforms/4xx for now
  [POWERPC] MPIC U3/U4 MSI backend
  [POWERPC] MPIC MSI allocator
  [POWERPC] Enable MSI mappings for MPIC
  [POWERPC] Tell Phyp we support MSI
  [POWERPC] RTAS MSI implementation
  [POWERPC] PowerPC MSI infrastructure
  [POWERPC] Rip out the existing powerpc msi stubs
  [POWERPC] Remove use of 4level-fixup.h for ppc32
  [POWERPC] Add powerpc PCI-E reset API implementation
  [POWERPC] Holly bootwrapper
  [POWERPC] Holly DTS
  [POWERPC] Holly defconfig
  [POWERPC] Add support for 750CL Holly board
  [POWERPC] Generalize tsi108 PCI setup
  [POWERPC] Generalize tsi108 PHY types
  ...

Fixed conflict in include/asm-powerpc/kdebug.h manually

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-05-08 11:50:19 -07:00
..
fbdev.c Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc 2007-05-08 11:50:19 -07:00
Makefile Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nv_driver.c nvidiafb/rivafb: switch to pci_get refcounting 2007-05-08 11:15:32 -07:00
nv_type.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
nvreg.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
riva_hw.c nvidiafb/rivafb: switch to pci_get refcounting 2007-05-08 11:15:32 -07:00
riva_hw.h [PATCH] atyfb, rivafb: minor fixes 2006-12-08 08:29:05 -08:00
riva_tbl.h Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
rivafb-i2c.c rivafb: fixed reversed DDC ports 2007-05-08 11:15:28 -07:00
rivafb.h rivafb/nvidiafb: Various cleanups 2007-05-08 11:15:28 -07:00