Merge ../linux-2.6 (26925c59) · Commits · e / devices / android_kernel_teracube_2e

MAINTAINERS

+19 −1

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@ P: Person
		M: Mail patches to
		L: Mailing list that is relevant to this area
		W: Web-page with status/info
		T: SCM tree type and URL. Type is one of: git, hg, quilt.
		T: SCM tree type and location. Type is one of: git, hg, quilt.
		S: Status, one of the following:

		Supported: Someone is actually paid to look after this.
		@@ -227,6 +227,7 @@ AGPGART DRIVER
		P: Dave Jones
		M: davej@codemonkey.org.uk
		W: http://www.codemonkey.org.uk/projects/agp/
		T: git kernel.org:/pub/scm/linux/kernel/git/davej/agpgart.git
		S: Maintained

		AHA152X SCSI DRIVER
		@@ -384,6 +385,7 @@ P: David Woodhouse
		M: dwmw2@infradead.org
		L: linux-audit@redhat.com
		W: http://people.redhat.com/sgrubb/audit/
		T: git kernel.org:/pub/scm/linux/kernel/git/dwmw2/audit-2.6.git
		S: Maintained

		AX.25 NETWORK LAYER
		@@ -432,6 +434,7 @@ L: bluez-devel@lists.sf.net
		W: http://bluez.sf.net
		W: http://www.bluez.org
		W: http://www.holtmann.org/linux/bluetooth/
		T: git kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git
		S: Maintained

		BLUETOOTH RFCOMM LAYER
		@@ -547,6 +550,7 @@ P: Steve French
		M: sfrench@samba.org
		L: samba-technical@lists.samba.org
		W: http://us1.samba.org/samba/Linux_CIFS_client.html
		T: git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
		S: Supported

		CIRRUS LOGIC GENERIC FBDEV DRIVER
		@@ -608,6 +612,7 @@ P: Dave Jones
		M: davej@codemonkey.org.uk
		L: cpufreq@lists.linux.org.uk
		W: http://www.codemonkey.org.uk/projects/cpufreq/
		T: git kernel.org/pub/scm/linux/kernel/davej/cpufreq.git
		S: Maintained

		CPUID/MSR DRIVER
		@@ -641,6 +646,7 @@ M: herbert@gondor.apana.org.au
		P: David S. Miller
		M: davem@davemloft.net
		L: linux-crypto@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
		S: Maintained

		CYBERPRO FB DRIVER
		@@ -1185,6 +1191,7 @@ P: Bartlomiej Zolnierkiewicz
		M: B.Zolnierkiewicz@elka.pw.edu.pl
		L: linux-kernel@vger.kernel.org
		L: linux-ide@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6.git
		S: Maintained

		IDE/ATAPI CDROM DRIVER
		@@ -1279,6 +1286,7 @@ P: Vojtech Pavlik
		M: vojtech@suse.cz
		L: linux-input@atrey.karlin.mff.cuni.cz
		L: linux-joystick@atrey.karlin.mff.cuni.cz
		T: git kernel.org:/pub/scm/linux/kernel/git/dtor/input.git
		S: Maintained

		INOTIFY
		@@ -1392,6 +1400,7 @@ P: Kai Germaschewski
		M: kai.germaschewski@gmx.de
		L: isdn4linux@listserv.isdn4linux.de
		W: http://www.isdn4linux.de
		T: git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
		S: Maintained

		ISDN SUBSYSTEM (Eicon active card driver)
		@@ -1420,6 +1429,7 @@ P: Dave Kleikamp
		M: shaggy@austin.ibm.com
		L: jfs-discussion@lists.sourceforge.net
		W: http://jfs.sourceforge.net/
		T: git kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6.git
		S: Supported

		KCONFIG
		@@ -1534,6 +1544,7 @@ P: Paul Mackerras
		M: paulus@samba.org
		W: http://www.penguinppc.org/
		L: linuxppc-dev@ozlabs.org
		T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git
		S: Supported

		LINUX FOR POWER MACINTOSH
		@@ -1601,6 +1612,7 @@ P: Chris Wright
		M: chrisw@osdl.org
		L: linux-security-module@wirex.com
		W: http://lsm.immunix.org
		T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
		S: Supported

		LM83 HARDWARE MONITOR DRIVER
		@@ -1695,6 +1707,7 @@ P: David Woodhouse
		M: dwmw2@infradead.org
		W: http://www.linux-mtd.infradead.org/
		L: linux-mtd@lists.infradead.org
		T: git kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6.git
		S: Maintained

		MICROTEK X6 SCANNER
		@@ -1815,6 +1828,7 @@ M: yoshfuji@linux-ipv6.org
		P: Patrick McHardy
		M: kaber@coreworks.de
		L: netdev@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/davem/net-2.6.git
		S: Maintained

		IPVS
		@@ -1866,6 +1880,7 @@ M: aia21@cantab.net
		L: linux-ntfs-dev@lists.sourceforge.net
		L: linux-kernel@vger.kernel.org
		W: http://linux-ntfs.sf.net/
		T: git kernel.org:/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git
		S: Maintained

		NVIDIA (RIVA) FRAMEBUFFER DRIVER
		@@ -2389,6 +2404,7 @@ P: Anton Blanchard
		M: anton@samba.org
		L: sparclinux@vger.kernel.org
		L: ultralinux@vger.kernel.org
		T: git kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6.git
		S: Maintained

		SHARP LH SUPPORT (LH7952X & LH7A40X)
		@@ -2527,6 +2543,7 @@ P: Adrian Bunk
		M: trivial@kernel.org
		L: linux-kernel@vger.kernel.org
		W: http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
		T: git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
		S: Maintained

		TMS380 TOKEN-RING NETWORK DRIVER
		@@ -2860,6 +2877,7 @@ P: Latchesar Ionkov
		M: lucho@ionkov.net
		L: v9fs-developer@lists.sourceforge.net
		W: http://v9fs.sf.net
		T: git kernel.org:/pub/scm/linux/kernel/ericvh/v9fs-devel.git
		S: Maintained

		VIDEO FOR LINUX

arch/i386/kernel/process.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -393,13 +393,6 @@ void flush_thread(void)
		{
		struct task_struct *tsk = current;

		/*
		* Remove function-return probe instances associated with this task
		* and put them back on the free list. Do not insert an exit probe for
		* this function, it will be disabled by kprobe_flush_task if you do.
		*/
		kprobe_flush_task(tsk);

		memset(tsk->thread.debugreg, 0, sizeof(unsigned long)*8);
		memset(tsk->thread.tls_array, 0, sizeof(tsk->thread.tls_array));
		/*

arch/i386/pci/common.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -132,7 +132,7 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum)
		}
		}

		printk("PCI: Probing PCI hardware (bus %02x)\n", busnum);
		printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum);

		return pci_scan_bus_parented(NULL, busnum, &pci_root_ops, NULL);
		}
		@@ -144,7 +144,7 @@ static int __init pcibios_init(void)
		struct cpuinfo_x86 *c = &boot_cpu_data;

		if (!raw_pci_ops) {
		printk("PCI: System does not support PCI\n");
		printk(KERN_WARNING "PCI: System does not support PCI\n");
		return 0;
		}

arch/i386/pci/direct.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -201,7 +201,7 @@ static int __init pci_sanity_check(struct pci_raw_ops *o)
		return 1;
		}

		DBG("PCI: Sanity check failed\n");
		DBG(KERN_WARNING "PCI: Sanity check failed\n");
		return 0;
		}

arch/i386/pci/i386.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -221,6 +221,11 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
		continue;

		r = &dev->resource[idx];
		if (!(r->flags & (IORESOURCE_IO \| IORESOURCE_MEM)))
		continue;
		if ((idx == PCI_ROM_RESOURCE) &&
		(!(r->flags & IORESOURCE_ROM_ENABLE)))
		continue;
		if (!r->start && r->end) {
		printk(KERN_ERR "PCI: Device %s not available because of resource collisions\n", pci_name(dev));
		return -EINVAL;
		@@ -230,8 +235,6 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask)
		if (r->flags & IORESOURCE_MEM)
		cmd \|= PCI_COMMAND_MEMORY;
		}
		if (dev->resource[PCI_ROM_RESOURCE].start)
		cmd \|= PCI_COMMAND_MEMORY;
		if (cmd != old_cmd) {
		printk("PCI: Enabling device %s (%04x -> %04x)\n", pci_name(dev), old_cmd, cmd);
		pci_write_config_word(dev, PCI_COMMAND, cmd);