Merge from-linus to-akpm (84ffa747) · Commits · 戴 / test

CREDITS

+1 −2

Original line number	Diff line number	Diff line
		@@ -2423,8 +2423,7 @@ S: Toronto, Ontario
		S: Canada

		N: Zwane Mwaikambo
		E: zwane@linuxpower.ca
		W: http://function.linuxpower.ca
		E: zwane@arm.linux.org.uk
		D: Various driver hacking
		D: Lowlevel x86 kernel hacking
		D: General debugging

+0 −14

Original line number	Diff line number	Diff line
		@@ -266,20 +266,6 @@ port an old driver to the new PCI interface. They are no longer present
		in the kernel as they aren't compatible with hotplug or PCI domains or
		having sane locking.

		pcibios_present() and Since ages, you don't need to test presence
		pci_present() of PCI subsystem when trying to talk to it.
		If it's not there, the list of PCI devices
		is empty and all functions for searching for
		devices just return NULL.
		pcibios_(read\|write)_* Superseded by their pci_(read\|write)_*
		counterparts.
		pcibios_find_* Superseded by their pci_get_* counterparts.
		pci_for_each_dev() Superseded by pci_get_device()
		pci_for_each_dev_reverse() Superseded by pci_find_device_reverse()
		pci_for_each_bus() Superseded by pci_find_next_bus()
		pci_find_device() Superseded by pci_get_device()
		pci_find_subsys() Superseded by pci_get_subsys()
		pci_find_slot() Superseded by pci_get_slot()
		pcibios_find_class() Superseded by pci_get_class()
		pci_find_class() Superseded by pci_get_class()
		pci_(read\|write)__nodev() Superseded by pci_bus_(read\|write)_()

+14 −2

Original line number	Diff line number	Diff line
		@@ -1739,7 +1739,7 @@ S: Maintained

		OPL3-SA2, SA3, and SAx DRIVER
		P: Zwane Mwaikambo
		M: zwane@commfireservices.com
		M: zwane@arm.linux.org.uk
		L: linux-sound@vger.kernel.org
		S: Maintained

		@@ -1825,6 +1825,12 @@ P: Greg Kroah-Hartman
		M: greg@kroah.com
		S: Maintained

		PCIE HOTPLUG DRIVER
		P: Kristen Carlson Accardi
		M: kristen.c.accardi@intel.com
		L: pcihpd-discuss@lists.sourceforge.net
		S: Maintained

		PCMCIA SUBSYSTEM
		P: Linux PCMCIA Team
		L: http://lists.infradead.org/mailman/listinfo/linux-pcmcia
		@@ -1989,7 +1995,7 @@ S: Maintained

		SC1200 WDT DRIVER
		P: Zwane Mwaikambo
		M: zwane@commfireservices.com
		M: zwane@arm.linux.org.uk
		S: Maintained

		SCHEDULER
		@@ -2201,6 +2207,12 @@ W: http://projects.buici.com/arm
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		SHPC HOTPLUG DRIVER
		P: Kristen Carlson Accardi
		M: kristen.c.accardi@intel.com
		L: pcihpd-discuss@lists.sourceforge.net
		S: Maintained

		SPARC (sparc32):
		P: William L. Irwin
		M: wli@holomorphy.com

+6 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,12 @@ __syscall_start:
		/* 310 */ .long sys_request_key
		.long sys_keyctl
		.long sys_semtimedop
		/* vserver */ .long sys_ni_syscall
		.long sys_ioprio_set
		/* 315 */ .long sys_ioprio_get
		.long sys_inotify_init
		.long sys_inotify_add_watch
		.long sys_inotify_rm_watch
		__syscall_end:

		.rept NR_syscalls - (__syscall_end - __syscall_start) / 4

+2 −2

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@
		* 28-Sep-2004 BJD Updates for new serial port bits
		* 04-Nov-2004 BJD Updated UART configuration process
		* 10-Jan-2005 BJD Removed s3c2410_clock_tick_rate
		* 13-Aug-2005 DA Removed UART from initial I/O mappings
		*/

		#include <linux/kernel.h>
		@@ -49,10 +50,9 @@ static struct map_desc s3c2410_iodesc[] __initdata = {
		IODESC_ENT(USBHOST),
		IODESC_ENT(CLKPWR),
		IODESC_ENT(LCD),
		IODESC_ENT(UART),
		IODESC_ENT(TIMER),
		IODESC_ENT(ADC),
		IODESC_ENT(WATCHDOG)
		IODESC_ENT(WATCHDOG),
		};

		static struct resource s3c_uart0_resource[] = {