Merge master.kernel.org:/home/rmk/linux-2.6-arm
commit50165d8b1d915422343079f79a878a0f7572feaa
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 22:57:53 +0000 (4 15:57 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 4 Oct 2005 22:57:53 +0000 (4 15:57 -0700)
tree55358d0e902b34c6d45f73afb16310e686212669
parent944d2647dded12e2b05ad8ebc020644bb1997ce1
parentc2f480869fa7559fa3532e415e3e3ec49339f208
Merge master.kernel.org:/home/rmk/linux-2.6-arm