Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 15 Jan 2006 22:59:29 +0000 (20:59 -0200)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Sun, 15 Jan 2006 22:59:29 +0000 (20:59 -0200)
commitf1dccedc8148026d9071c6805f7cb77374a9e56f
treeba4a630084b8d21309930321ff53a6ed4381c0f3
parentc943aa859c392eb4cc76d911daa1f261555075b2
parent0238cb4e7583c521bb3538060f98a73e65f61324
Merge ssh:///linux/kernel/git/torvalds/linux-2.6