Merge pull request #8772 from aluzzardi/docker-info-mem-cpu

Expose # of CPUs and memory available on docker info.
Update libcontainer f60d7b9195f8dc0b5d343abbc3293d

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Merge pull request #8828 from crosbymichael/update-libcontainer-oct4

Update libcontainer to f60d7b9195f8dc0b5d343abbc3293d
Revert "Use code generation to set IAMSTATIC instead of -X"

This reverts commit 3e10b93106dea94e5747ab32fe4ac765aa22f9bc.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Merge pull request #8717 from yosifkit/docs-dockerfile

Cleanup docs Dockerfile, so it matches best practices.
Revert "use code generation for GITCOMMIT/VERSION too"

This reverts commit 85744a35de0e30c2dd6741b833f38ff218c8a3fc.

Conflicts:
	.gitignore
	hack/make.sh

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Revert "finally, use code generation for INITSHA1 & INITPATH too"

This reverts commit c7c620dd9fce0e7b437ee185c7a58341f3b8e3aa.

Conflicts:
	.gitignore
	hack/make.sh
	hack/make/dynbinary

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Merge pull request #8833 from jfrazelle/revert-gccgo-changes

Revert gccgo changes
Fix error on successful login.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Merge pull request #8836 from jfrazelle/hub-login-error

Fix error on successful login.
Merge pull request #8762 from fredlf/tutorial-tweaks

Tweaks to Dockerfile tutorial
Merge pull request #8750 from matm/patch-2

dockerimages.md: typo fix
Merge pull request #8646 from ndeloof/patch-3

Update docker_remote_api.md
Merge pull request #8734 from alex/patch-2

Replace fast with quickly
Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers

Adding self to various maintainers files.
Merge pull request #8352 from zachborboa/patch-1

Fix typo
Merge pull request #8808 from nhsiehgit/dockerfiletut

changed dockerfile back button to look nicer
Merge pull request #8790 from cloojure/patch-2

Update faq.md
Updated the COPY directive reference: Source can't be a URL for COPY (+ formatting error fixes)

Signed-off-by: Roman Dudin <katrmr@gmail.com>
Merge pull request #8319 from MalteJ/ipv6-ipallocator

Implementing IPv6 functionality for ipallocator