Linux 3.4.11

Conflicts:
	fs/buffer.c