Merge master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:53:33 +0000 (15:53 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Thu, 1 Dec 2005 23:53:33 +0000 (15:53 -0800)
commitca98f825ea05edb41346f12408caa30be8a287c6
tree98826d67758b0bd028a04e16446441adb66f4d66
parentb67c26e4fcfdade157d5bd54085720e71518cccd
parent11849fe67430ba48547e17b25a7831da29863efa
Merge master.kernel.org:/home/rmk/linux-2.6-arm