Hi Philip,

On 06/26/2014 01:28 PM, Philip Paeps wrote:
> Changes since v1:
> 
>  o Fix coding style nits and useless casts
>  o Use prefixes
>  o Make enable go to CFUN=4 (powered but radio off)
> 
> 
> Philip Paeps (6):
>   atmodem: add vendor u-blox
>   udevng: add detection logic for u-blox modems
>   plugins: new driver for u-blox SARA-U270 modems
>   sim: query u-blox PIN retries with AT+UPINCNT
>   gprs: add support for u-blox +UREG URCs
>   atmodem: set the auth method for u-blox modems
> 
>  Makefile.am                    |    3 +
>  drivers/atmodem/gprs-context.c |   31 ++++-
>  drivers/atmodem/gprs.c         |   44 ++++++
>  drivers/atmodem/sim.c          |   45 +++++++
>  drivers/atmodem/vendor.h       |    3 +-
>  plugins/ublox.c                |  291 ++++++++++++++++++++++++++++++++++++++++
>  plugins/udevng.c               |   42 ++++++
>  7 files changed, 455 insertions(+), 4 deletions(-)
>  create mode 100644 plugins/ublox.c
> 

Can you rebase the rest of the patches in this series, they no longer
apply cleanly and 3-way merge gets confused as well.

Regards,
-Denis