Merge commit 'v3.4' into android-tegra-nv-3.4
Varun Wadekar [Mon, 4 Jun 2012 10:43:38 +0000 (15:43 +0530)]
14 files changed:
1  2 
arch/arm/mm/mmu.c
arch/arm/vfp/vfpmodule.c
block/genhd.c
drivers/crypto/Kconfig
drivers/net/usb/cdc_ether.c
drivers/net/usb/usbnet.c
fs/proc/base.c
include/linux/usb/usbnet.h
kernel/sched/core.c
net/bluetooth/af_bluetooth.c
net/bluetooth/hci_core.c
net/bluetooth/hci_event.c
net/bluetooth/l2cap_core.c
net/ipv4/tcp.c

Simple merge
Simple merge
diff --cc block/genhd.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc fs/proc/base.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/ipv4/tcp.c
Simple merge