Merge branch 'master' into config_file

Conflicts:
	openbsc/src/vty_interface.c
tree: 0f8bad6211e80ab17ef425b8d35107c6d6704028
  1. linux-kernel/
  2. openbsc/
  3. wireshark/