Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:07 +0000 (10:27 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 29 Dec 2005 18:27:07 +0000 (10:27 -0800)
commit77f234f9d995c9b576b311a56f66db6837e598df
tree6dce48a0710fd05597173fe6b49a8ef482ec51f2
parent80c72579f74fcfcd63e27c5e317091cb35bb1f12
parenta710ce08585e920740ffc84c7f3c82f4081169cf
Merge master.kernel.org:/home/rmk/linux-2.6-serial