| commit | cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 29 08:37:12 2012 -0700 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Oct 29 08:37:12 2012 -0700 |
| tree | 28695d8b8cbc1876e2e60880f45a502a7ded043d | |
| parent | d9ff3934171b5cf1ac17e5fcd39f3f324b4724ce [diff] | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 [diff] |
Merge 3.7-rc3 into staging-next This resolves the conflict with: drivers/staging/comedi/drivers/amplc_dio200.c and syncs up the changes that happened in the staging directory for 3.7-rc3. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>