Merge tag 'v3.14.26' into backport/v3.14.24-ltsi-rc1+v3.14.26/snapshot-merge.wip
authorSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 00:41:35 +0000 (09:41 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 10 Dec 2014 00:41:35 +0000 (09:41 +0900)
commitbed11ad3de0303c05b6225e4c54a907e55890d42
tree5819278e585fd04fd1295e862860b4c1dc5190ab
parentab903ec6af0006d8d209adfe3153ea9b9ed9d81e
parent356a3e1fde11190febb8ace3cdab8694848ed220
Merge tag 'v3.14.26' into backport/v3.14.24-ltsi-rc1+v3.14.26/snapshot-merge.wip

This is the 3.14.26 stable release

Conflicts:
Makefile
Makefile
drivers/usb/host/xhci-pci.c
drivers/usb/host/xhci-plat.c
drivers/usb/host/xhci.c
drivers/usb/host/xhci.h
sound/soc/sh/fsi.c