| commit | 4175160b065e74572819a320dcd34129224a4e1c | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 21 15:15:24 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon May 21 15:15:24 2012 +0100 |
| tree | 3298e2c9a7c7db33bf28617875e5429e17eec61c | |
| parent | ddf90a2ff2c4a9da99acc898a4afeab3e4251fcd [diff] | |
| parent | 0ec8e7aa8f63f0cacd545fcd7f40f93fde2c0e6e [diff] |
Merge branch 'misc' into for-linus Conflicts: arch/arm/kernel/ptrace.c