Skip to content
GitLab
Commit 9f2bb5e0 authored by Sebastian Kuzminsky's avatar Sebastian Kuzminsky
Browse files

Merge branch 'v3.2' into v3.3 

Conflicts:
	debian/changelog
	eeprom_local.c
	pci_boards.c
parents 3c326c9a 35d69bef
Hide whitespace changes
Inline Side-by-side
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment