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)
commit52839bfb0c4b56b5c2688c96ce656df4034b2c87
tree78dbf1ffd79ab2a317e7aed25d1db106de0c2ef2
parent616837b5f00e69ec5dd3e09d243d2f688be1f25f
parent2dc2565902d3c24108c4b7101e91957fd068a242
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

This is the 3.14.25 stable release

Conflicts:
Makefile
Makefile
drivers/ata/sata_rcar.c