Merge commit 'v3.4.8' into android-t114-3.4-rebased
authorVarun Wadekar <vwadekar@nvidia.com>
Mon, 13 Aug 2012 08:53:04 +0000 (13:53 +0530)
committerVarun Wadekar <vwadekar@nvidia.com>
Mon, 13 Aug 2012 08:53:04 +0000 (13:53 +0530)
commit82cfe176157cf926133dea3a8879135bf20b9af2
tree8efe310a6dd0d411399ce299aecfaf3bd96de393
parent564e6b431e9696d6b7186d120d563a74ae290092
parent8067fa23092f2c4e18c29c90f7d5bb765dbf8954
Merge commit 'v3.4.8' into android-t114-3.4-rebased

Linux v3.4.8

Conflicts:
drivers/net/tun.c
kernel/power/suspend.c

Change-Id: Ia26546425cd20f127dbf4dd58cfca41bda47d23d
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
15 files changed:
Makefile
drivers/hid/hid-input.c
drivers/hid/hid-multitouch.c
drivers/mmc/host/sdhci.c
drivers/net/ethernet/realtek/r8169.c
drivers/net/tun.c
drivers/usb/gadget/u_ether.c
fs/exec.c
fs/ext4/super.c
include/linux/cpu.h
include/linux/mm.h
kernel/power/hibernate.c
kernel/power/suspend.c
net/ipv4/tcp.c
sound/pci/hda/patch_hdmi.c