Merge with git+ssh://master.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git (c0e4077c) · Commits · e / devices / android_kernel_xiaomi_markw

CREDITS

+6 −3

Original line number	Original line	Diff line number	Diff line
	@@ -1127,8 +1127,10 @@ S: Carnegie, Pennsylvania 15106-4304
	S: USA		S: USA

	N: Philip Gladstone		N: Philip Gladstone
	E: philip@raptor.com		E: philip@gladstonefamily.net
	D: Kernel / timekeeping stuff		D: Kernel / timekeeping stuff
			S: Carlisle, MA 01741
			S: USA

	N: Jan-Benedict Glaw		N: Jan-Benedict Glaw
	E: jbglaw@lug-owl.de		E: jbglaw@lug-owl.de
	@@ -3741,10 +3743,11 @@ D: Mylex DAC960 PCI RAID driver
	D: Miscellaneous kernel fixes		D: Miscellaneous kernel fixes

	N: Alessandro Zummo		N: Alessandro Zummo
	E: azummo@ita.flashnet.it		E: a.zummo@towertech.it
	W: http://freepage.logicom.it/azummo/
	D: CMI8330 support is sb_card.c		D: CMI8330 support is sb_card.c
	D: ISAPnP fixes in sb_card.c		D: ISAPnP fixes in sb_card.c
			D: ZyXEL omni.net lcd plus driver
			D: RTC subsystem
	S: Italy		S: Italy

	N: Marc Zyngier		N: Marc Zyngier

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -199,6 +199,8 @@ address during PCI bus mastering you might do something like:
	"mydev: 24-bit DMA addressing not available.\n");		"mydev: 24-bit DMA addressing not available.\n");
	goto ignore_this_device;		goto ignore_this_device;
	}		}
			[Better use DMA_24BIT_MASK instead of 0x00ffffff.
			See linux/include/dma-mapping.h for reference.]

	When pci_set_dma_mask() is successful, and returns zero, the PCI layer		When pci_set_dma_mask() is successful, and returns zero, the PCI layer
	saves away this mask you have provided. The PCI layer will use this		saves away this mask you have provided. The PCI layer will use this

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -605,7 +605,7 @@ are the same as those shown in the preceding section, so they are omitted.
	{		{
	int cpu;		int cpu;

	for_each_cpu(cpu)		for_each_possible_cpu(cpu)
	run_on(cpu);		run_on(cpu);
	}		}

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -26,7 +26,7 @@ Installing a bootloader

	A couple of bootloaders able to boot Linux on Assabet are available:		A couple of bootloaders able to boot Linux on Assabet are available:

	BLOB (http://www.lart.tudelft.nl/lartware/blob/)		BLOB (http://www.lartmaker.nl/lartware/blob/)

	BLOB is a bootloader used within the LART project. Some contributed		BLOB is a bootloader used within the LART project. Some contributed
	patches were merged into BLOB to add support for Assabet.		patches were merged into BLOB to add support for Assabet.

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,4 +11,4 @@ is under development, with plenty of others in different stages of
	planning.		planning.

	The hardware designs for this board have been released under an open license;		The hardware designs for this board have been released under an open license;
	see the LART page at http://www.lart.tudelft.nl/ for more information.		see the LART page at http://www.lartmaker.nl/ for more information.