Merge branch 'bkl' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:24 +0000 (15:31 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 4 Aug 2010 13:31:24 +0000 (15:31 +0200)

Trivial merge