diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 15:37:29 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-14 15:37:29 -0700 |
commit | 1e91adf7cb0bea07c1e2548754ca5004e8da8544 (patch) | |
tree | 0fb2566bd25adc2a6c7123d00e3c80f63aeedaa5 /lib/.gitignore | |
parent | d40ce1708000fcf19c597e88c9074f442a557113 (diff) | |
parent | ddffeb8c4d0331609ef2581d84de4d763607bd37 (diff) | |
download | op-kernel-dev-1e91adf7cb0bea07c1e2548754ca5004e8da8544.zip op-kernel-dev-1e91adf7cb0bea07c1e2548754ca5004e8da8544.tar.gz |
Merge 3.7-rc1 usb-linus
Sync up to a known-good point in Linus's tree to build on.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/.gitignore')
-rw-r--r-- | lib/.gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/.gitignore b/lib/.gitignore index 3bef1ea..09aae85 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -3,4 +3,4 @@ # gen_crc32table crc32table.h - +oid_registry_data.c |