Merge branches 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)
committerJiri Kosina <jkosina@suse.cz>
Sat, 23 Oct 2010 20:44:36 +0000 (22:44 +0200)

Trivial merge