linux-beagleboard 3.8: backport merge_config.sh from Linux 3.17

Signed-off-by: Ilkka Myller <ilkka.myller@nodefield.com>
Merge pull request #17 from imyller/master

linux-beagleboard 3.8: backport merge_config.sh from Linux 3.17