Merge branches 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Sat, 8 Jan 2011 00:08:19 +0000 (01:08 +0100)
committerJiri Kosina <jkosina@suse.cz>
Sat, 8 Jan 2011 00:08:19 +0000 (01:08 +0100)

Trivial merge