tree 080ba867394e0346b699ffe17973a76faa0e6920
parent cc896f08717c445235554a7963a7b2ecf58911ad
parent 344babaa9d39b10b85cadec4e5335d43b52b4ec0
author Linus Torvalds <torvalds@g5.osdl.org> 1126139305 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1126139305 -0700

Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6