]> Git Repo - linux.git/commitdiff
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <[email protected]>
Mon, 2 Jun 2008 22:25:03 +0000 (15:25 -0700)
committerLinus Torvalds <[email protected]>
Mon, 2 Jun 2008 22:25:03 +0000 (15:25 -0700)
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
  [POWERPC] Fix DMA nodes in the MPC8610 HPCD device tree
  [POWERPC] Export empty_zero_page and copy_page in arch/ppc
  [POWERPC] Add "memory" clobber to MMIO accessors
  [POWERPC] pasemi: update pasemi_defconfig, enable electra_cf
  electra_cf: Add MODULE_DEVICE_TABLE()


Trivial merge
This page took 0.049399 seconds and 4 git commands to generate.