Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
authorJaroslav Kysela <perex@suse.cz>
Wed, 1 Feb 2006 12:08:56 +0000 (13:08 +0100)
committerJaroslav Kysela <perex@suse.cz>
Wed, 1 Feb 2006 12:08:56 +0000 (13:08 +0100)

Trivial merge