diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:54:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-05-27 03:54:33 +0200 |
| commit | 829455bb0e994373519e3c58d403fc1148f44630 (patch) | |
| tree | 7e4a250eb8208e2a7fa2787b03d2cf989a8ccc5a /drivers/iio/dac/ad5624r_spi.c | |
| parent | staging: ozwpan: Revert last changes (diff) | |
| parent | Linux 3.10-rc3 (diff) | |
| download | linux-829455bb0e994373519e3c58d403fc1148f44630.tar.xz linux-829455bb0e994373519e3c58d403fc1148f44630.zip | |
Merge 3.10-rc3 into staging-next
We want the changes here, and we resolve the merge conflict that was
happening in the nvec_kbd.c file.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/dac/ad5624r_spi.c')
0 files changed, 0 insertions, 0 deletions