Merge to-linus-stable into to-akpm
authorLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:52:00 +0000 (15:52 -0400)
committerLen Brown <len.brown@intel.com>
Mon, 15 Aug 2005 19:52:00 +0000 (15:52 -0400)

Trivial merge