Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorJiri Kosina <jkosina@suse.cz>
Mon, 7 Jul 2008 09:30:31 +0000 (11:30 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 7 Jul 2008 09:30:31 +0000 (11:30 +0200)

Trivial merge