Linux 3.4.71

Conflicts:
	drivers/uio/uio.c
	drivers/video/au1100fb.c
	drivers/video/au1200fb.c
Linux 3.4.72

Conflicts:
	fs/ext4/xattr.c