]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
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)
commit621de593081524da2f0f7b060f5951b4155eb4a2
treedcb1777094498496a3036b0e49546887e72d6a06
parentafa5eb7c68689ced4284f01c96feed44a2d0a127
parent6d77976800c3f29a0337fadcc9ddd79050fa5620
Merge branch 'autosuspend' into for-next

Conflicts:

drivers/hid/hid-core.c
drivers/hid/hid-core.c
drivers/hid/usbhid/hid-core.c
drivers/hid/usbhid/hiddev.c
include/linux/hid.h