git.openpandora.org / pandora-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bcefc8d 77154a2)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jul 2010 00:27:29 +0000 (17:27 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 15 Jul 2010 00:27:29 +0000 (17:27 -0700)
commitea4c1a7e14051e2ba81fc7dc02e3d55bfb2d7548
treeed80eaf6245d8d1509662dc42e7184391b91e7d1tree | snapshot
parentbcefc8d0d3a0cba9078f519d69f138b93ad30e39commit | diff
parent77154a2026ee5cb2ce05a7d370c16e4c123028e5commit | diff
Merge branch 'merge' of git://git./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)
Pandora Kernel Repository