]> git.apps.os.sepia.ceph.com Git - ceph-client.git/commit
projects / ceph-client.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: ee3af6e 0e337b4)
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 17:22:04 +0000 (10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 May 2009 17:22:04 +0000 (10:22 -0700)
commit363383277081ce831642b72df40932ee05ce40a2
treedf7785ed6807cb6d5bcb8ef6431fd1cbf172051ftree | snapshot
parentee3af6ee77f61cac3c8f770c65736bf5ed03a697commit | diff
parent0e337b42d620ca7c45fe64e64dd71957c56216c9commit | 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: Explicit alignment for .data.cacheline_aligned
  powerpc/ps3: Update ps3_defconfig
  powerpc/ftrace: Fix constraint to be early clobber
  powerpc/ftrace: Use pr_devel() in ftrace.c
  powerpc: Do not assert pte_locked for hugepage PTE entries
Unnamed repository; edit this file 'description' to name the repository.