Merge branches 'upstream-fixes', 'bkl-removal', 'debugfs-fixes' and 'hid-suspend...
authorJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:05:06 +0000 (14:05 +0200)
committerJiri Kosina <jkosina@suse.cz>
Wed, 19 May 2010 12:05:06 +0000 (14:05 +0200)

Trivial merge