]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8b490b5 af9e4e5)
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)
commit5e55ee21dedf3ecb69a3018103ca28171f2dee3f
treeed80eaf6245d8d1509662dc42e7184391b91e7d1tree | snapshot
parent8b490b567e67b7e08fef91d54360590838742525commit | diff
parentaf9e4e59fecfc568c8a29d7f18e51b76374e7bf3commit | 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)
Linux Kernel Source Tree.