| commit | ea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 14 17:27:29 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jul 14 17:27:29 2010 -0700 |
| tree | ed80eaf6245d8d1509662dc42e7184391b91e7d1 | |
| parent | bcefc8d0d3a0cba9078f519d69f138b93ad30e39 [diff] | |
| parent | 77154a2026ee5cb2ce05a7d370c16e4c123028e5 [diff] |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: powerpc/fsl-booke: Fix address issue when using relocatable kernels powerpc/cpm1: Mark micropatch code/data static and __init powerpc/cpm1: Fix build with various CONFIG_*_UCODE_PATCH combinations powerpc/cpm: Reintroduce global spi_pram struct (fixes build issue)