tree 3628af0d6e4be079c9638edb17e20dab74d19cea
parent 6cf2b3fc9934a56ceeb393ea5d0149e0bebc80fa
parent 7d6064d44bc79e328f2794ee7322ba2676511e2b
author Linus Torvalds <torvalds@ppc970.osdl.org> 1117388413 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1117388413 -0700

Automatic merge of 'for-linus' branch from

	rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input