[This patch applies to both linux and mm trees.  Please send comments 
off list, thanks]