Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6 (748c5151) · Commits · e / devices / android_kernel_fairphone_FP4

.gitignore

+1 −0

+6 −6

Original line number	Diff line number	Diff line
		@@ -959,7 +959,7 @@ S: 2037 Walnut #6
		S: Boulder, Colorado 80302
		S: USA

		N: Heiko Eissfeldt
		N: Heiko Eißfeldt
		E: heiko@colossus.escape.de heiko@unifix.de
		D: verify_area stuff, generic SCSI fixes
		D: SCSI Programming HOWTO
		@@ -1988,8 +1988,8 @@ N: Volker Lendecke
		E: vl@kki.org
		D: Kernel smbfs (to mount WfW, NT and OS/2 network drives.)
		D: NCP filesystem support (to mount NetWare volumes)
		S: Von Ossietzky Str. 12
		S: 37085 Goettingen
		S: Von-Ossietzky-Str. 12
		S: 37085 Göttingen
		S: Germany

		N: Kevin Lentin
		@@ -2431,11 +2431,11 @@ S: 12725 SW Millikan Way, Suite 400
		S: Beaverton, Oregon 97005
		S: USA

		N: Eberhard Moenkeberg
		N: Eberhard Mönkeberg
		E: emoenke@gwdg.de
		D: CDROM driver "sbpcd" (Matsushita/Panasonic/Soundblaster)
		S: Ruhstrathoehe 2 b.
		S: D-37085 Goettingen
		S: Ruhstrathöhe 2 b.
		S: D-37085 Göttingen
		S: Germany

		N: Thomas Molina

+1 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,7 @@ quiet_cmd_db2man = MAN $@
		@touch $@

		###
		# Rules to generate postscripts and PNG imgages from .fig format files
		# Rules to generate postscripts and PNG images from .fig format files
		quiet_cmd_fig2eps = FIG2EPS $@
		cmd_fig2eps = fig2dev -Leps $< $@

+3 −3

Original line number	Diff line number	Diff line
		@@ -282,7 +282,7 @@ int __init board_init (void)
		goto out;
		}

		/* map physical adress */
		/* map physical address */
		baseaddr = (unsigned long)ioremap(CHIP_PHYSICAL_ADDRESS, 1024);
		if(!baseaddr){
		printk("Ioremap to access NAND chip failed\n");
		@@ -306,7 +306,7 @@ int __init board_init (void)
		this->dev_ready = board_dev_ready;
		this->eccmode = NAND_ECC_SOFT;

		/* Scan to find existance of the device */
		/* Scan to find existence of the device */
		if (nand_scan (board_mtd, 1)) {
		err = -ENXIO;
		goto out_ior;
		@@ -340,7 +340,7 @@ static void __exit board_cleanup (void)
		/* Release resources, unregister device */
		nand_release (board_mtd);

		/* unmap physical adress */
		/* unmap physical address */
		iounmap((void *)baseaddr);

		/* Free the MTD device structure */

+1 −1

Original line number	Diff line number	Diff line
		@@ -67,7 +67,7 @@ kernel patches.
		20: Check that it all passes `make headers_check'.

		21: Has been checked with injection of at least slab and page-allocation
		fauilures. See Documentation/fault-injection/.
		failures. See Documentation/fault-injection/.

		If the new code is substantial, addition of subsystem-specific fault
		injection might be appropriate.