Merge remote-tracking branch 'ksys/master' into replicant-merge
authorAlexander Tarasikov <alexander.tarasikov@gmail.com>
Fri, 24 Aug 2012 16:24:35 +0000 (20:24 +0400)
committerAlexander Tarasikov <alexander.tarasikov@gmail.com>
Fri, 24 Aug 2012 16:24:35 +0000 (20:24 +0400)
Conflicts:
gprs.c
net.c

1  2 
samsung-ril.c
samsung-ril.h

diff --cc samsung-ril.c
Simple merge
diff --cc samsung-ril.h
Simple merge