Merge branch 'master' into sms

Conflicts:
	openbsc/include/openbsc/gsm_data.h
	openbsc/src/bsc_hack.c
	openbsc/src/vty_interface.c
tree: f10f0c7cb2558778fdd033c288620e409d1f6fe9
  1. linux-kernel/
  2. openbsc/
  3. wireshark/