diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:59:44 +0000 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-26 19:59:44 +0000 |
commit | dcf81c1af839b77b44404453ecae6e5ac5a75f05 (patch) | |
tree | 289dcbda5fbca34e7e0cf028908b9b517fa8b8b2 /fs/lockd | |
parent | 34e5f4f198ddd36a82dc12164de7fc4f5430e09d (diff) | |
parent | 75c06963dd947252271ffa6107a25cddb2b8f362 (diff) |
Merge branch 'amba' into for-armsoc
Diffstat (limited to 'fs/lockd')
0 files changed, 0 insertions, 0 deletions