Auto merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorTony Luck <tony.luck@intel.com>
Sun, 17 Jul 2005 19:30:06 +0000 (12:30 -0700)
committerTony Luck <tony.luck@intel.com>
Sun, 17 Jul 2005 19:30:06 +0000 (12:30 -0700)

Trivial merge