merge: https://github.com/beagleboard/linux/pull/15

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