Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0ca0f16f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug',... 

Merge branches 'x86/apic', 'x86/asm', 'x86/cleanups', 'x86/debug', 'x86/kconfig', 'x86/mm', 'x86/ptrace', 'x86/setup' and 'x86/urgent'; commit 'v2.6.29-rc8' into x86/core
parents c550033c 7a81d9a7 88200bc2 0f3fa48a 91219bcb 06340235 773e673d 5a8ac9d2 16a67919 895791da

Documentation/filesystems/ext2.txt

+5 −5
Original line number Diff line number Diff line
@@ -373,10 +373,10 @@ Filesystem Resizing http://ext2resize.sourceforge.net/ 
Compression (*)		http://e2compr.sourceforge.net/



Implementations for:

Windows 95/98/NT/2000	http://uranus.it.swin.edu.au/~jn/linux/Explore2fs.htm

Windows 95 (*)		http://www.yipton.demon.co.uk/content.html#FSDEXT2

Windows 95/98/NT/2000	http://www.chrysocome.net/explore2fs

Windows 95 (*)		http://www.yipton.net/content.html#FSDEXT2

DOS client (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

OS/2			http://perso.wanadoo.fr/matthieu.willm/ext2-os2/

RISC OS client		ftp://ftp.barnet.ac.uk/pub/acorn/armlinux/iscafs/

OS/2 (*)		ftp://metalab.unc.edu/pub/Linux/system/filesystems/ext2/

RISC OS client		http://www.esw-heim.tu-clausthal.de/~marco/smorbrod/IscaFS/



(*) no longer actively developed/supported (as of Apr 2001)
 
(*) no longer actively developed/supported (as of Mar 2009)

Documentation/filesystems/ext3.txt

+2 −2
Original line number Diff line number Diff line
@@ -198,5 +198,5 @@ kernel source: <file:fs/ext3/> 
programs: 	http://e2fsprogs.sourceforge.net/

		http://ext2resize.sourceforge.net



useful links:	http://www-106.ibm.com/developerworks/linux/library/l-fs7/

		http://www-106.ibm.com/developerworks/linux/library/l-fs8/
 
useful links:	http://www.ibm.com/developerworks/library/l-fs7.html

		http://www.ibm.com/developerworks/library/l-fs8.html

Documentation/hwmon/lm90

+10 −0
Original line number Diff line number Diff line
@@ -42,6 +42,11 @@ Supported chips: 
    Addresses scanned: I2C 0x4e

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3497

  * Maxim MAX6648

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500

  * Maxim MAX6649

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c
@@ -74,6 +79,11 @@ Supported chips: 
                           0x4c, 0x4d and 0x4e

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3370

  * Maxim MAX6692

    Prefix: 'max6646'

    Addresses scanned: I2C 0x4c

    Datasheet: Publicly available at the Maxim website

               http://www.maxim-ic.com/quick_view2.cfm/qv_pk/3500





Author: Jean Delvare <khali@linux-fr.org>

MAINTAINERS

+1 −3
Original line number Diff line number Diff line
@@ -1469,8 +1469,6 @@ L: linux-acpi@vger.kernel.org 
S:	Supported



DOCUMENTATION (/Documentation directory)

P:	Michael Kerrisk

M:	mtk.manpages@gmail.com

P:	Randy Dunlap

M:	rdunlap@xenotime.net

L:	linux-doc@vger.kernel.org
@@ -2879,7 +2877,7 @@ P: Michael Kerrisk 
M:	mtk.manpages@gmail.com

W:	http://www.kernel.org/doc/man-pages

L:	linux-man@vger.kernel.org

S:	Supported

S:	Maintained



MARVELL LIBERTAS WIRELESS DRIVER

P:	Dan Williams

Makefile

+13 −7
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Erotic Pickled Herring



# *DOCUMENTATION*
@@ -905,12 +905,18 @@ localver = $(subst $(space),, $(string) \ 
# and if the SCM is know a tag from the SCM is appended.

# The appended tag is determined by the SCM used.

#

# Currently, only git is supported.

# Other SCMs can edit scripts/setlocalversion and add the appropriate

# checks as needed.

# .scmversion is used when generating rpm packages so we do not loose

# the version information from the SCM when we do the build of the kernel

# from the copied source

ifdef CONFIG_LOCALVERSION_AUTO



ifeq ($(wildcard .scmversion),)

        _localver-auto = $(shell $(CONFIG_SHELL) \

                         $(srctree)/scripts/setlocalversion $(srctree))

else

        _localver-auto = $(shell cat .scmversion 2> /dev/null)

endif



	localver-auto  = $(LOCALVERSION)$(_localver-auto)

endif
@@ -1538,7 +1544,7 @@ quiet_cmd_depmod = DEPMOD $(KERNELRELEASE) 
      cmd_depmod = \

	if [ -r System.map -a -x $(DEPMOD) ]; then                              \

		$(DEPMOD) -ae -F System.map                                     \

		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) -r)   \

		$(if $(strip $(INSTALL_MOD_PATH)), -b $(INSTALL_MOD_PATH) )     \

		$(KERNELRELEASE);                                               \

	fi