diff options
author | 2014-05-05 12:27:30 -0700 | |
---|---|---|
committer | 2014-05-05 12:27:30 -0700 | |
commit | af46929e6ee7197dfe315af3c5bb5cc75a0aec9c (patch) | |
tree | 18359b934daf8c7e271930c938bd867a379cace7 /drivers/video/fbdev/macmodes.c | |
parent | ASoC: fsl_spdif: Use clk_set_rate() for spdif root clock only (diff) | |
parent | Linux 3.15-rc4 (diff) | |
download | wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.tar.xz wireguard-linux-af46929e6ee7197dfe315af3c5bb5cc75a0aec9c.zip |
Merge tag 'v3.15-rc4' into asoc-fsl-spdif
Linux 3.15-rc4
Diffstat (limited to '')
-rw-r--r-- | drivers/video/fbdev/macmodes.c (renamed from drivers/video/macmodes.c) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/drivers/video/macmodes.c b/drivers/video/fbdev/macmodes.c index af86c081d2be..af86c081d2be 100644 --- a/drivers/video/macmodes.c +++ b/drivers/video/fbdev/macmodes.c |