Merge branch 'minix' of https://github.com/kerolasa/lelux-utiliteetit

Merge branch 'minix' of https://github.com/kerolasa/lelux-utiliteetit

* 'minix' of https://github.com/kerolasa/lelux-utiliteetit:
  libblkid: move MINIX_MAXPARTITIONS to minix.h
  minix: move globals and inline functions to minix_programs.h
  libblkid: use MINIX_BLOCK_SIZE from minix.h
  libblkid: use superblock structure from minix.h
  include: move minix.h to include directory
  include: remove kernel headers from minix.h
  include: minix.h: use data types from stdint.h

Conflicts:
	disk-utils/Makefile.am

Signed-off-by: Karel Zak <kzak@redhat.com>