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)
commit554a526381db5cda5dda5724e8fcbe94fca6f3d9
tree3b79dec643be682d7ed1bd0edb4ab0a37feb9f7a
parentccf9b863a3f5b118b13c54f030ef7a77e672d758
parentc4d12a5c5bcb5fe29fb13e9afa23975af3fbb63b
Merge remote-tracking branch 'ksys/master' into replicant-merge

Conflicts:
gprs.c
net.c
samsung-ril.c
samsung-ril.h