This patch does not apply to a clean 2.6.23.13 tree using either of patch -p1