Merge commit 'origin/master'

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