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

Simple merge