Merge from-linus to-akpm
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 20:07:26 +0000 (16:07 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 20:07:26 +0000 (16:07 -0400)

Trivial merge