Merge branches 'bkl-removal', 'upstream' and 'upstream-fixes' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)
committerJiri Kosina <jkosina@suse.cz>
Mon, 7 Dec 2009 17:30:49 +0000 (18:30 +0100)

Trivial merge