Gary Lineker back at work for BBC after a row sparked by his criticism of the UK government's new asylum policy resolved.
