Merge "cfq-iosched: Fix null pointer dereference"