Merge branch 'autosuspend' into for-next
authorJiri Kosina <jkosina@suse.cz>
Mon, 30 Mar 2009 13:14:53 +0000 (15:14 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 30 Mar 2009 13:14:53 +0000 (15:14 +0200)
Conflicts:

drivers/hid/hid-core.c


Trivial merge