tree c2439482df66e8d8aa727db70c4ec33a920b74c3
parent 005940ead619c2867e0465c8e0fffb9e5989b57e
parent 7087e295543d3f6e161530e07982fd979e2d9efc
author Linus Torvalds <torvalds@g5.osdl.org> 1124852448 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1124852448 -0700

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