tree 3849e8457dd8f038ab7da025c708e275b43ea9c1
parent a94130e00038ebeb2f66901a4a4a9e05a03051c1
parent e5119885f00874453e837e3407014b73de2f4741
author Linus Torvalds <torvalds@ppc970.osdl.org> 1119908851 -0700
committer Linus Torvalds <torvalds@ppc970.osdl.org> 1119908851 -0700

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

Some manual fixups required due to clashes with the PF_FREEZE cleanups.