Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 22:00:08 +0000 (15:00 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Tue, 28 Jun 2005 22:00:08 +0000 (15:00 -0700)
commit7e568e62e9d4674d487cdc11f369e49e56ce6703
tree3d9c1c04341ccadb5d4b9c73eda50b62f0f103b3
parentadb2705a89e8b41abcf29c0ed86f4ce93ab36734
parent50273978975ee62938b7ca612e281927cd789c13
Merge master.kernel.org:/home/rmk/linux-2.6-arm