3.13: merge: https://github.com/beagleboard/kernel/pull/89

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>