diff options
| author | Linus Torvalds <[email protected]> | 2016-10-06 14:58:01 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2016-10-06 14:58:01 +0000 |
| commit | c7f5d36a3cc26e5068f4444aa22c4579e5eac85f (patch) | |
| tree | 42f87d43c289127945d45ba4e1c082fdcba60f68 /net/switchdev/switchdev.c | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg... (diff) | |
| parent | ARM: fix delays (diff) | |
| download | kernel-c7f5d36a3cc26e5068f4444aa22c4579e5eac85f.tar.gz kernel-c7f5d36a3cc26e5068f4444aa22c4579e5eac85f.zip | |
Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm
Pull ARM fix from Russell King:
"A 5% error in delay calculation was introduced during the last merge
window, which had gone un-noticed until yesterday"
* 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm:
ARM: fix delays
Diffstat (limited to 'net/switchdev/switchdev.c')
0 files changed, 0 insertions, 0 deletions