diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 16:30:47 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-12-05 16:30:47 +0000 |
| commit | fbe4dd088f449cbae586aa8af51d271297c75f9f (patch) | |
| tree | 4bef2e3d2fce8ed65dab57948b2ab40745d5397f /arch/arm/kernel/kprobes-arm.c | |
| parent | 3f4aa45ceea5789a4aade536acc27f2e0d3da5e1 (diff) | |
| parent | 13d1b9575ac2c2da143cd2236b6cf0fc314570f8 (diff) | |
| parent | b816ccc5c01fb7fe1fb001ff7aa5aa7e5a8aa76b (diff) | |
| parent | 86d88bfca4758a9a95cbd183c917d623abc3ce84 (diff) | |
Merge branches 'fixes', 'misc', 'pm' and 'sa1100' into for-next