rebase beaglebone defconfig on v3.12-rc1

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