diff options
author | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
---|---|---|
committer | Paul Moore <pmoore@redhat.com> | 2014-01-23 15:52:06 -0500 |
commit | 41be702a542a0d14bb0b1c16e824fa9ed27616ec (patch) | |
tree | e48942a05882da47544e179c6a0c920e00137a6a /lib/crc-t10dif.c | |
parent | 8ed814602876bec9bad2649ca17f34b499357a1c (diff) | |
parent | d8ec26d7f8287f5788a494f56e8814210f0e64be (diff) | |
download | op-kernel-dev-41be702a542a0d14bb0b1c16e824fa9ed27616ec.zip op-kernel-dev-41be702a542a0d14bb0b1c16e824fa9ed27616ec.tar.gz |
Merge tag 'v3.13' into next
Linux 3.13
Minor fixup needed in selinux_inet_conn_request()
Conflicts:
security/selinux/hooks.c
Diffstat (limited to 'lib/crc-t10dif.c')
0 files changed, 0 insertions, 0 deletions