From: Simon Horman <horms+renesas@verge.net.au>
Date: Wed, 10 Dec 2014 00:41:35 +0000 (+0900)
Subject: Merge tag 'v3.14.26' into backport/v3.14.24-ltsi-rc1+v3.14.26/snapshot-merge.wip
X-Git-Tag: upstream/snapshot3+hdmi~4
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git;a=commitdiff_plain;h=bed11ad3de0303c05b6225e4c54a907e55890d42

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
---

bed11ad3de0303c05b6225e4c54a907e55890d42
diff --cc Makefile
index 216e47a,63a5ee8..de8d637
--- a/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 14
- SUBLEVEL = 25
+ SUBLEVEL = 26
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Remembering Coco
  
  # *DOCUMENTATION*
diff --cc drivers/usb/host/xhci.h
index 6d13ec7,96e9e78..2c8c598
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@@ -1760,10 -1758,9 +1760,10 @@@ int xhci_run(struct usb_hcd *hcd)
  void xhci_stop(struct usb_hcd *hcd);
  void xhci_shutdown(struct usb_hcd *hcd);
  int xhci_gen_setup(struct usb_hcd *hcd, xhci_get_quirks_t get_quirks);
 +void xhci_init_driver(struct hc_driver *drv, int (*setup_fn)(struct usb_hcd *));
  
  #ifdef	CONFIG_PM
- int xhci_suspend(struct xhci_hcd *xhci);
+ int xhci_suspend(struct xhci_hcd *xhci, bool do_wakeup);
  int xhci_resume(struct xhci_hcd *xhci, bool hibernated);
  #else
  #define	xhci_suspend	NULL