e.cz> 1238418893 +0200
committer Jiri Kosina <jkosina@suse.cz> 1238418893 +0200

Merge branch 'autosuspend' into for-next

Conflicts:

	drivers/hid/hid-core.c
cíe&ž