aboutsummaryrefslogtreecommitdiffstats
path: root/linux-kernel
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2010-04-19 17:17:59 +0800
committerHolger Hans Peter Freyther <zecke@selfish.org>2010-04-19 17:17:59 +0800
commitf044c585e2b07479de3aed3a448c6402b89db01c (patch)
treee1611d27d38b1569a9909448ab20eadd89af31e5 /linux-kernel
parent6d17dd13143aa67c5b8bc0199ab1aefba82f90a9 (diff)
parent38e9c821143a9b86227ae02b1830de43b67facab (diff)
Merge remote branch 'origin/master' into on-waves/bsc-master
Conflicts: openbsc/include/openbsc/abis_rsl.h openbsc/include/openbsc/mgcp.h openbsc/src/abis_rsl.c openbsc/src/chan_alloc.c openbsc/src/handover_logic.c openbsc/src/mgcp/mgcp_network.c openbsc/src/vty/command.c openbsc/src/vty_interface.c
Diffstat (limited to 'linux-kernel')
0 files changed, 0 insertions, 0 deletions