lkml.org 
[lkml]   [2011]   [Sep]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    Subjectlinux-next: manual merge of the moduleh tree with the staging tree
    Hi Paul,

    Today's linux-next merge of the moduleh tree got a conflict in
    drivers/staging/iio/accel/adis16220_core.c between commits 7991029a55fa
    ("staging:iio:accel:adis16220 iio_chan_spec conversion") and 6f4ebab56870
    ("staging: iio: adis16220_core.c: add module.h") from the staging tree
    and commit 6eee8b750254 ("staging: Add module.h to more drivers
    implicitly using it") from the moduleh tree.

    The staging commits are a superset of the part of the moduleh commit that
    affects this file, so I dropped the moduleh change (module.h was added in
    different places).
    --
    Cheers,
    Stephen Rothwell sfr@canb.auug.org.au
    http://www.canb.auug.org.au/~sfr/
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-09-29 07:59    [W:0.021 / U:31.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site