Linux 3.4.46

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>

Conflicts:

	drivers/net/ethernet/realtek/r8169.c