Merge branch 'master' into for-next

diff --cc CREDITS
Simple merge

diff --cc arch/arc/Kconfig
Simple merge

diff --cc block/blk-core.c
Simple merge

diff --cc block/blk-map.c
Simple merge

diff --cc drivers/ata/libata-core.c
Simple merge

diff --cc drivers/base/bus.c
Simple merge

diff --cc drivers/gpu/drm/drm_crtc_helper.c
Simple merge

diff --cc drivers/regulator/core.c
Simple merge

diff --cc drivers/scsi/scsi_transport_iscsi.c
Simple merge

diff --cc drivers/staging/android/Kconfig
Simple merge

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

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

diff --cc fs/buffer.c
Simple merge

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

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

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

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

diff --cc include/linux/usb/composite.h
Simple merge

diff --cc include/net/mac80211.h
Simple merge

diff --cc kernel/signal.c
Simple merge

diff --cc net/core/dev.c
Simple merge