ignore user_type in android nand MBR; these can be other than 0 or 2
contrary to Allwinner's expectations
allow the user to set the user_type from the command line
(optional -- backwards compatible with existing usage
sends the nand driver a BLKRRPART via ioctl; depends on kernel mods
that allow on-the-fly repartitioning of the nand
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools
cosmetic change: got rid of "if (1 || ...)" tests and enclosing blocks
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools

Conflicts:
	nand-part.c
Merge branch 'master' of git://github.com/linux-sunxi/sunxi-tools

Conflicts:
	nand-part.c
build both A10 and A20 nand-part executables
allow setting of partition 1 size/offset
if -f option is used, force writing of MBR header, even if CRC or
header magic/version are incorrect (for recovery only)