Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
commit4fc60facde2590f119bef8dea3a5150a2dcc210f
authorLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 8 Oct 2004 09:51:16 +0000 (8 02:51 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Fri, 8 Oct 2004 09:51:16 +0000 (8 02:51 -0700)
tree4d236573fb0679838500b5ca1dc8a54bde03a66e
parent9c733a5afe3e03a796a55dea13643a65e5135b3f
parent0363141540e337254680ff3c63d35292a49928d9
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux