Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:48:06 +0000 (15:48 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 14 Dec 2005 23:48:06 +0000 (15:48 -0800)
commitc7868048a7314bb4a2973097d605f00acd3b70bd
treeaf27746d5b75c22e9cbc4d7145562e2accc650c0
parent9d149c27eb1581edd239c0db96a407a4fc5e9f18
parentc2e2611425a956d25d2948c5d95d3848c4db1257
Merge master.kernel.org:/home/rmk/linux-2.6-arm