Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (9c5ef0fb) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/HOWTO

+13 −15

Original line number	Diff line number	Diff line
		@@ -322,39 +322,34 @@ kernel releases as described above.
		Here is a list of some of the different kernel trees available:
		git trees:
		- Kbuild development tree, Sam Ravnborg <sam@ravnborg.org>
		kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
		git.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git

		- ACPI development tree, Len Brown <len.brown@intel.com>
		kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
		git.kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git

		- Block development tree, Jens Axboe <axboe@suse.de>
		kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
		git.kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git

		- DRM development tree, Dave Airlie <airlied@linux.ie>
		kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git
		git.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6.git

		- ia64 development tree, Tony Luck <tony.luck@intel.com>
		kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git

		- ieee1394 development tree, Jody McIntyre <scjody@modernduck.com>
		kernel.org:/pub/scm/linux/kernel/git/scjody/ieee1394.git
		git.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git

		- infiniband, Roland Dreier <rolandd@cisco.com>
		kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git
		git.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git

		- libata, Jeff Garzik <jgarzik@pobox.com>
		kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
		git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git

		- network drivers, Jeff Garzik <jgarzik@pobox.com>
		kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
		git.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git

		- pcmcia, Dominik Brodowski <linux@dominikbrodowski.net>
		kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
		git.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git

		- SCSI, James Bottomley <James.Bottomley@SteelEye.com>
		kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git

		Other git kernel trees can be found listed at http://kernel.org/git
		git.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6.git

		quilt trees:
		- USB, PCI, Driver Core, and I2C, Greg Kroah-Hartman <gregkh@suse.de>
		@@ -362,6 +357,9 @@ Here is a list of some of the different kernel trees available:
		- x86-64, partly i386, Andi Kleen <ak@suse.de>
		ftp.firstfloor.org:/pub/ak/x86_64/quilt/

		Other kernel trees can be found listed at http://git.kernel.org/ and in
		the MAINTAINERS file.

		Bug Reporting
		-------------

MAINTAINERS

+4 −4

Original line number	Diff line number	Diff line
		@@ -3618,7 +3618,7 @@ W: http://www.kroah.com/linux-usb/
		USB DAVICOM DM9601 DRIVER
		P: Peter Korsgaard
		M: jacmet@sunsite.dk
		L: linux-usb-devel@lists.sourceforge.net
		L: netdev@vger.kernel.org
		W: http://www.linux-usb.org/usbnet
		S: Maintained

		@@ -3702,8 +3702,8 @@ S: Maintained
		USB PEGASUS DRIVER
		P: Petko Manolov
		M: petkan@users.sourceforge.net
		L: linux-usb-users@lists.sourceforge.net
		L: linux-usb-devel@lists.sourceforge.net
		L: netdev@vger.kernel.org
		W: http://pegasus2.sourceforge.net/
		S: Maintained

		@@ -3717,8 +3717,8 @@ S: Maintained
		USB RTL8150 DRIVER
		P: Petko Manolov
		M: petkan@users.sourceforge.net
		L: linux-usb-users@lists.sourceforge.net
		L: linux-usb-devel@lists.sourceforge.net
		L: netdev@vger.kernel.org
		W: http://pegasus2.sourceforge.net/
		S: Maintained

		@@ -3829,7 +3829,7 @@ S: Maintained
		USB "USBNET" DRIVER FRAMEWORK
		P: David Brownell
		M: dbrownell@users.sourceforge.net
		L: linux-usb-devel@lists.sourceforge.net
		L: netdev@vger.kernel.org
		W: http://www.linux-usb.org/usbnet
		S: Maintained

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 2
		PATCHLEVEL = 6
		SUBLEVEL = 22
		EXTRAVERSION = -rc6
		EXTRAVERSION = -rc7
		NAME = Holy Dancing Manatees, Batman!

		# DOCUMENTATION

arch/arm/kernel/calls.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -350,7 +350,7 @@
		CALL(sys_set_robust_list)
		CALL(sys_get_robust_list)
		/* 340 */ CALL(sys_splice)
		CALL(sys_arm_sync_file_range)
		CALL(sys_sync_file_range2)
		CALL(sys_tee)
		CALL(sys_vmsplice)
		CALL(sys_move_pages)

arch/arm/kernel/sys_arm.c

+0 −13

Original line number	Diff line number	Diff line
		@@ -328,16 +328,3 @@ asmlinkage long sys_arm_fadvise64_64(int fd, int advice,
		{
		return sys_fadvise64_64(fd, offset, len, advice);
		}

		/*
		* Yet more syscall fsckage - we can't fit sys_sync_file_range's
		* arguments into the available registers with EABI. So, let's
		* create an ARM specific syscall for this which has _sane_
		* arguments. (This incidentally also has an ABI-independent
		* argument layout.)
		*/
		asmlinkage long sys_arm_sync_file_range(int fd, unsigned int flags,
		loff_t offset, loff_t nbytes)
		{
		return sys_sync_file_range(fd, offset, nbytes, flags);
		}