]> www.infradead.org Git - nvme.git/commitdiff
projects / nvme.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b968d2 b2ad7b5)
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 17:38:02 +0000 (10:38 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 9 Sep 2005 17:38:02 +0000 (10:38 -0700)
1  2 
arch/ppc64/kernel/iomap.c patch | diff1 | diff2 | blob | history

diff --cc arch/ppc64/kernel/iomap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.