| commit | e94c805f0c234ef54609f23695b60add6b25ad40 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Tue May 29 22:13:55 2012 +0100 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Tue May 29 22:13:55 2012 +0100 |
| tree | 09e116c62b065316eb93070e78a1843d9055373a | |
| parent | ef0c14842e6e04b860d0309c5d5a3c1ead344e35 [diff] | |
| parent | 70b58d896b1b30e4b89d369fbeb244c0e952cf9f [diff] |
Merge branch 'for-arm' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal.git into for-linus Conflicts: arch/arm/kernel/ptrace.c