diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-02-13 08:30:07 +0100 |
| commit | e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2 (patch) | |
| tree | 7ccf35788cbb9def996204399f079366da251361 /kernel/futex.c | |
| parent | locking/atomics: Update comment about READ_ONCE() and structures (diff) | |
| parent | Merge tag 'pci-v4.5-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
| download | linux-e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2.tar.xz linux-e2d6f8a5f596b1f09839990b11a3c2e0c9f0dbc2.zip | |
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 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions