diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 09:14:25 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2013-12-19 09:14:25 +0100 |
| commit | 236573d2405d6b9fa5395d14731c2ec2f8cb8f4f (patch) | |
| tree | ff261b48f83b55785d146a36d88fa2a51479e247 /arch/arm/boot/dts/ste-nomadik-s8815.dts | |
| parent | Merge remote-tracking branch 'daniel-lezcano/clockevents/for-Simon-3.13-rc2' ... (diff) | |
| parent | Linux 3.13-rc3 (diff) | |
| download | linux-236573d2405d6b9fa5395d14731c2ec2f8cb8f4f.tar.xz linux-236573d2405d6b9fa5395d14731c2ec2f8cb8f4f.zip | |
Merge tag 'v3.13-rc3' into dt3-base
Linux 3.13-rc3
Conflicts:
drivers/pinctrl/sh-pfc/pfc-r8a7740.c
drivers/pinctrl/sh-pfc/pfc-sh7372.c
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-s8815.dts')
0 files changed, 0 insertions, 0 deletions