forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/ke…
…rnel/git/shawnguo/linux into fixes Merge "ARM: imx: fixes for 3.18, 2nd round" from Shawn Guo: "This is the second round of i.MX fixes for 3.18. The clk-vf610 fix is relatively big, because it needs some adaption to the change made by offending commit dc4805c (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver). And it should have been sent to you for earlier -rc inclusion, but unfortunately it got delayed for some time because Stefan wasn't aware of my email address change." The i.MX fixes for 3.18, 2nd round: - Fix a regression on Vybrid platform which is caused by commit dc4805c (ARM: imx: remove ENABLE and BYPASS bits from clk-pllv3 driver), and results in a missing configuration on PLL clocks. - Fix a regression with i.MX defconfig files where CONFIG_SPI option gets lost accidentally. * tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (460 commits) ARM: imx: Fix the removal of CONFIG_SPI option ARM: imx: clk-vf610: define PLL's clock tree + Linux 3.18-rc3 Signed-off-by: Olof Johansson <[email protected]>
- Loading branch information
Showing
509 changed files
with
4,647 additions
and
3,962 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,4 +20,4 @@ Date: November 2007 | |
Contact: Konrad Rzeszutek <[email protected]> | ||
Description: The /sys/firmware/ibft/ethernetX directory will contain | ||
files that expose the iSCSI Boot Firmware Table NIC data. | ||
This can this can the IP address, MAC, and gateway of the NIC. | ||
Usually this contains the IP address, MAC, and gateway of the NIC. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,9 @@ I. For patch submitters | |
|
||
[email protected] | ||
|
||
3) The Documentation/ portion of the patch should come in the series before | ||
the code implementing the binding. | ||
|
||
II. For kernel maintainers | ||
|
||
1) If you aren't comfortable reviewing a given binding, reply to it and ask | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
# PTP 1588 clock support - User space test program | ||
# | ||
# Copyright (C) 2010 OMICRON electronics GmbH | ||
# | ||
# This program is free software; you can redistribute it and/or modify | ||
# it under the terms of the GNU General Public License as published by | ||
# the Free Software Foundation; either version 2 of the License, or | ||
# (at your option) any later version. | ||
# | ||
# This program is distributed in the hope that it will be useful, | ||
# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
# GNU General Public License for more details. | ||
# | ||
# You should have received a copy of the GNU General Public License | ||
# along with this program; if not, write to the Free Software | ||
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
|
||
CC = $(CROSS_COMPILE)gcc | ||
INC = -I$(KBUILD_OUTPUT)/usr/include | ||
CFLAGS = -Wall $(INC) | ||
LDLIBS = -lrt | ||
PROGS = testptp | ||
|
||
all: $(PROGS) | ||
|
||
testptp: testptp.o | ||
|
||
clean: | ||
rm -f testptp.o | ||
|
||
distclean: clean | ||
rm -f $(PROGS) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4313,17 +4313,21 @@ F: Documentation/blockdev/cpqarray.txt | |
F: drivers/block/cpqarray.* | ||
|
||
HEWLETT-PACKARD SMART ARRAY RAID DRIVER (hpsa) | ||
M: "Stephen M. Cameron" <[email protected].com> | ||
M: Don Brace <don.brace@pmcs.com> | ||
L: [email protected] | ||
L: [email protected] | ||
L: [email protected] | ||
S: Supported | ||
F: Documentation/scsi/hpsa.txt | ||
F: drivers/scsi/hpsa*.[ch] | ||
F: include/linux/cciss*.h | ||
F: include/uapi/linux/cciss*.h | ||
|
||
HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss) | ||
M: Mike Miller <mike.miller@hp.com> | ||
M: Don Brace <don.brace@pmcs.com> | ||
L: [email protected] | ||
L: [email protected] | ||
L: [email protected] | ||
S: Supported | ||
F: Documentation/blockdev/cciss.txt | ||
F: drivers/block/cciss* | ||
|
@@ -4609,7 +4613,7 @@ S: Supported | |
F: drivers/crypto/nx/ | ||
|
||
IBM Power 842 compression accelerator | ||
M: Nathan Fontenot <[email protected].ibm.com> | ||
M: Dan Streetman <ddstreet@us.ibm.com> | ||
S: Supported | ||
F: drivers/crypto/nx/nx-842.c | ||
F: include/linux/nx842.h | ||
|
@@ -9605,7 +9609,6 @@ F: drivers/staging/unisys/ | |
|
||
UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER | ||
M: Vinayak Holikatti <[email protected]> | ||
M: Santosh Y <[email protected]> | ||
L: [email protected] | ||
S: Supported | ||
F: Documentation/scsi/ufs.txt | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.