diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 11:37:12 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-29 11:37:12 -0400 |
| commit | cb1f6268acd7f1bca7153fa9ca187ffb73f60ab8 (patch) | |
| tree | 28695d8b8cbc1876e2e60880f45a502a7ded043d /include/linux/can/Kbuild | |
| 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>
Diffstat (limited to 'include/linux/can/Kbuild')
| -rw-r--r-- | include/linux/can/Kbuild | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/include/linux/can/Kbuild b/include/linux/can/Kbuild deleted file mode 100644 index e69de29bb2d1..000000000000 --- a/include/linux/can/Kbuild +++ /dev/null | |||