Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 13 Jun 2005 21:47:47 +0000 (14:47 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Mon, 13 Jun 2005 21:47:47 +0000 (14:47 -0700)
commit386bfcf5e8a3c34d92156c945c8db58a1e2f7c69
treec62e56731b3740a1962af91c261de7c2a0d3bbcc
parent980802e311088fda56c16650589faa4597c695fb
parenta8fa3f0c59f8a1e1d89542cff0be5b057b684653
Merge master.kernel.org:/home/rmk/linux-2.6-arm