Merge branch 'aufs3.2/11proc_map' into aufs3.3/11proc_map
Merge branch 'aufs3.3/10static' into aufs3.3/11proc_map
Merge branch 'aufs3.3/10static' into aufs3.4/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.4/00base' into aufs3.4/10static
Merge branch 'aufs3.3/11proc_map' into aufs3.4/11proc_map
Merge branch 'aufs3.4/10static' into aufs3.4/11proc_map
Merge branch 'aufs3.4/10static' into aufs3.5/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.5/00base' into aufs3.5/10static
Merge branch 'aufs3.4/11proc_map' into aufs3.5/11proc_map
Merge branch 'aufs3.5/10static' into aufs3.5/11proc_map
Merge branch 'aufs3.5/10static' into aufs3.6/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.6/00base' into aufs3.6/10static
Merge branch 'aufs3.5/11proc_map' into aufs3.6/11proc_map
Merge branch 'aufs3.6/10static' into aufs3.6/11proc_map
Merge branch 'aufs3.6/10static' into aufs3.7/10static
Merge remote-tracking branch 'aufs3-standalone/aufs3.7/00base' into aufs3.7/10static
Merge branch 'aufs3.6/11proc_map' into aufs3.7/11proc_map
Merge branch 'aufs3.7/10static' into aufs3.7/11proc_map
Merge branch 'aufs3.7/10static' into aufs3.8/10static

Conflicts:
	fs/aufs/branch.h

Signed-off-by: J. R. Okajima <hooanon05@yahoo.co.jp>
Merge remote-tracking branch 'aufs3-standalone/aufs3.8/00base' into aufs3.8/10static