Merge tag 'v3.10.60' into update

This is the 3.10.60 stable release

diff --cc Makefile
Simple merge

diff --cc arch/x86/mm/pageattr.c
Simple merge

diff --cc drivers/net/ppp/ppp_generic.c
Simple merge

diff --cc drivers/tty/serial/serial_core.c
Simple merge

diff --cc drivers/tty/tty_io.c
Simple merge

diff --cc drivers/usb/class/cdc-acm.c
Simple merge

diff --cc drivers/usb/core/hcd.c
Simple merge

diff --cc drivers/usb/gadget/f_acm.c
Simple merge

diff --cc drivers/usb/gadget/udc-core.c
Simple merge

diff --cc drivers/usb/serial/option.c
Simple merge

diff --cc drivers/usb/storage/transport.c
Simple merge

diff --cc fs/buffer.c
Simple merge

diff --cc fs/ext4/ext4.h
Simple merge

diff --cc fs/ext4/inode.c
Simple merge

diff --cc fs/ext4/ioctl.c
Simple merge

diff --cc fs/ext4/super.c
Simple merge

diff --cc fs/namespace.c
Simple merge

diff --cc fs/super.c
Simple merge

diff --cc fs/ubifs/ubifs.h
Simple merge

diff --cc include/linux/blkdev.h
Simple merge

diff --cc include/linux/compiler.h
Simple merge

diff --cc include/linux/mm.h
Simple merge

diff --cc kernel/freezer.c
Simple merge

diff --cc kernel/module.c
Simple merge

diff --cc kernel/power/hibernate.c
Simple merge

diff --cc kernel/power/process.c
Simple merge

diff --cc mm/oom_kill.c
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/netlink/af_netlink.c
Simple merge

diff --cc security/selinux/hooks.c
Simple merge