diff options
author | James Morris <james.l.morris@oracle.com> | 2014-09-18 17:52:46 +0400 |
---|---|---|
committer | James Morris <james.l.morris@oracle.com> | 2014-09-18 17:52:46 +0400 |
commit | 6f98e892884c32b9273ecce1332b849bcad3b8b1 (patch) | |
tree | 400e8ae29e555753e0ec085bf452f7206eb8c159 /drivers/char/toshiba.c | |
parent | ac60ab4b4968b54fb5af20eac9dd78e36ad910c1 (diff) | |
parent | 21c7eae21a2100a89cfb8cebaf7b770271f32c6e (diff) | |
download | linux-6f98e892884c32b9273ecce1332b849bcad3b8b1.tar.xz |
Merge branch 'smack-for-3.18' of git://git.gitorious.org/smack-next/kernel into next
Diffstat (limited to 'drivers/char/toshiba.c')
0 files changed, 0 insertions, 0 deletions