projects / platform / adaptation / renesas_rcar / renesas_kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 616837b 2dc2565)
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
authorSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:48:48 +0000 (17:48 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 5 Dec 2014 08:48:48 +0000 (17:48 +0900)
This is the 3.14.25 stable release

Conflicts:
Makefile

1  2 
Makefile patch | diff1 | diff2 | blob | history
drivers/ata/sata_rcar.c patch | diff1 | diff2 | blob | history

diff --cc Makefile
index d0c19fc,eb96e40..216e47a
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  VERSION = 3
  PATCHLEVEL = 14
- SUBLEVEL = 24
+ SUBLEVEL = 25
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Remembering Coco
  
  # *DOCUMENTATION*
diff --cc drivers/ata/sata_rcar.c
Simple merge
Domain: System / Uncategorized;