| commit | f365ad5fc001cbd02968a376e0aecffe52ce79e1 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 15:25:03 2008 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Jun 02 15:25:03 2008 -0700 |
| tree | 8677f1409e36c30f0f105249a63bf11d3993f32f | |
| parent | 61ac7bf538db2044d0238fcd87b3d9df59294bf2 [diff] | |
| parent | 9c8b28c2ef532c2cf32b59aaa0bc07eb3b866ef7 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * '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()