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)
commit3aed77bc84013fced136977b7cc17fff60eddf7a
tree75ee4060f58f033deb16771a303fb55dd370b6f9
parent0b968d23610d65a46299347b141a687e207bd294
parentb2ad7b5e8115582cdf5bbda065aa516c24d62c21
Merge /pub/scm/linux/kernel/git/paulus/ppc64-2.6
arch/ppc64/kernel/iomap.c