I merged a slightly better fix, you all were on cc. It's going into 3.10 and it's tagged stable, so it will show up in stable kernels soon.
Thanks for the fix! But where did you post it - on LKML? (I didn't see it because I'm not subscribed to LKML?)