defconfig: update

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Merge branch 'aosp_upstream' into aosp

Conflicts:
	Makefile
	drivers/usb/serial/ftdi_sio.c
	drivers/usb/serial/option.c
	drivers/video/console/fbcon.c
	kernel/signal.c
	kernel/time/tick-broadcast.c
	kernel/trace/ftrace.c
	net/core/rtnetlink.c
	net/ipv4/tcp_input.c
	sound/usb/midi.c
fix warning: 'ps0_need' may be used uninitialized in this function

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>
Revert "msm: acpuclock-8960: allow 192MHz minimum voltage"

This reverts commit f88e750ce16eb83f6c8bb926eb0d82e38717ff9d.
defconfig: update

Signed-off-by: Dennis Rassmann <showp1984@gmail.com>