]> err.no Git - linux-2.6/commit
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2008 00:36:37 +0000 (17:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Sep 2008 00:36:37 +0000 (17:36 -0700)
commit3e25a2d90e7e303168540c5ecb726297940cb172
tree14575147133b9e1dfab74d55a48cc05c25bec5b9
parent316343e2cfd9a4bb4c70d0e1991e7a74840fe29e
parent7888bc2b4778fda267a6e6422c4497dba865a47a
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 for getting CPU number in power_save_ppc32_restore()
  powerpc: Fix build error with 64K pages and !hugetlbfs
  powerpc: Work around gcc's -fno-omit-frame-pointer bug
  powerpc: Make sure _etext is after all kernel text
  powerpc: Only make kernel text pages of linear mapping executable
  powerpc: Fix uninitialised variable in VSX alignment code