Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:03 +0000 (15:09 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 9 Jan 2006 23:09:03 +0000 (15:09 -0800)
commit05814450070f13b671fc9dbf89477677aa0258cb
tree4c7f6e85c59a79d0e5835cbca69de5642071a833
parent8e9c238c3884c226f0cddc31cde87dd5df1a6500
parenta61c2d78ce61e67baf27c43f6721db87a27ac762
Merge master.kernel.org:/home/rmk/linux-2.6-serial