diff options
| author | Ingo Molnar | 2015-08-03 10:52:25 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2015-08-03 10:52:25 +0200 |
| commit | 3a7651e683701dbb4c7d02e20661c923fa4c6901 (patch) | |
| tree | 20e2a6550952517f20206211dd79ed258010f80a /arch/xtensa | |
| parent | 5d285a7f35b55c8fba346306ad3eb174c4f7eab1 (diff) | |
| parent | cba77f03f2c7b6cc0b0a44a3c679e0abade7da62 (diff) | |
| parent | 74d33293e467df61de1b1d8b2fbe29e550dec33b (diff) | |
Merge branch 'locking/urgent', tag 'v4.2-rc5' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>