diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-13 10:30:07 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-13 10:30:07 +0300 |
| commit | e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2 (patch) | |
| tree | 7ccf35788cbb9def996204399f079366da251361 /Documentation/leds | |
| parent | fed0764fafd8e2e629a033c0f7df4106b0dcb7f0 (diff) | |
| parent | 0cbb0b92689a1c4e0ac55f6188be563a813ac808 (diff) | |
| download | linux-e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2.tar.xz | |
Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
kernel/locking/lockdep.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/leds')
0 files changed, 0 insertions, 0 deletions