Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 22:53:25 +0000 (14:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 10 Feb 2006 22:53:25 +0000 (14:53 -0800)
commit0825c5d0f717816916f0e5ef9d89be51b3c52786
tree69362a4034c67b563da267dc63a19f614fe1d69f
parentd6c662d4f13801fe5ce24e8bbdea321e2572d7e5
parente19816808346cc1619733532a267a11dce8f8a12
Merge master.kernel.org:/home/rmk/linux-2.6-arm