Merge master.kernel.org:/home/rmk/linux-2.6-serial
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 01:48:37 +0000 (17:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 01:48:37 +0000 (17:48 -0800)
commited28f96ac1960f30f818374d65be71d2fdf811b0
tree7229e77dbd27eee1378d1317c63c272dbe57cac0
parent1480d0a31db62b9803f829cc0e5cc71935ffe3cc
parenta2436b22deac7834e0f87897b207a2dc1407dc40
Merge master.kernel.org:/home/rmk/linux-2.6-serial