tree ca88fd8f8f81b167dc4685ed34e9636f267db60d
parent b095518ef51c37658c58367bd19240b8a113f25c
parent bef9c558841604116704e10b3d9ff3dbf4939423
author  <jgarzik@pretzel.yyz.us> 1117086430 -0400
committer Jeff Garzik <jgarzik@pobox.com> 1117086430 -0400

Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD