Merge master.kernel.org:/home/rmk/linux-2.6-arm
commita5222049f3e26c21ecd65bfcc9b666d4c813933b
authorLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:13:11 +0000 (17 08:13 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Fri, 17 Feb 2006 16:13:11 +0000 (17 08:13 -0800)
treef4474d66f0150b8dba8675b373a90d5509af9d75
parent7054ec7f86cada917626c05fe461abccca816d3b
parentd9db950cfa3d674ee834d980c329efdf8e4a0568
Merge master.kernel.org:/home/rmk/linux-2.6-arm