Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:23:03 +0000 (12:23 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 12 Jan 2006 20:23:03 +0000 (12:23 -0800)
commit8b87e1baff24e586c3fe6c168843d213119bf4dd
tree419c0f4cbcc2d211e99a445984f569e6ae612eb2
parenta2b421fee37d34c09bd2a14d3e9294f838c64370
parentf392ecfa12de9a2baf72789b00557bac040d6171
Merge master.kernel.org:/home/rmk/linux-2.6-serial