diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-09 13:49:02 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-06-09 13:49:02 -0700 |
| commit | dc5a18941b4226846f0c5994e4f45bc685f7bcfe (patch) | |
| tree | 8189cc7586fb875484bce2a7122f2152343904bb /lib/crc32defs.h | |
| parent | 461df4ded3a143f09f9d0e870e7b16b787dc0591 (diff) | |
| parent | c773298788598a26e325bc2639877c76818943e3 (diff) | |
| download | op-kernel-dev-dc5a18941b4226846f0c5994e4f45bc685f7bcfe.zip op-kernel-dev-dc5a18941b4226846f0c5994e4f45bc685f7bcfe.tar.gz | |
Merge Linus's tree into staging-next
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'lib/crc32defs.h')
0 files changed, 0 insertions, 0 deletions
