diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-22 14:33:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-22 14:33:11 -0800 |
| commit | cb95413971d605b0d152d3ceecc47ba8991d66fb (patch) | |
| tree | 82d8fa9cd7f34049bbef455562488ea4c96c75a9 /net/8021q/vlanproc.c | |
| parent | ecde00642c79c2dfc9006e7751ee60bd0e21e1e9 (diff) | |
| parent | 6bab4a8a1888729f17f4923cc5867e4674f66333 (diff) | |
Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fix from Thomas Gleixner:
"A single bugfix for an init order problem in the sun4i subarch
clockevents code"
* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
clockevent: sun4i: Fix race condition in the probe code
Diffstat (limited to 'net/8021q/vlanproc.c')
0 files changed, 0 insertions, 0 deletions