Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorJiri Kosina <jkosina@suse.cz>
Tue, 20 May 2008 14:43:50 +0000 (16:43 +0200)
committerJiri Kosina <jkosina@suse.cz>
Tue, 20 May 2008 14:43:50 +0000 (16:43 +0200)

Trivial merge