sync
sync
sync
sync
sync
sync
sync
sync
sync
Merge branch 'master' into todd.enablebluetooth

Conflicts:
	arch/gumstix/conf/GENERIC
sync
sync
sync
sync
Merge branch 'master' into todd.enablebluetooth