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

Commit d087e4bd authored by Anton Altaparmakov's avatar Anton Altaparmakov
Browse files

Merge branch 'master' of /usr/src/ntfs-2.6/

parents 292d4ed3 88026842

Documentation/arm/00-INDEX

+2 −0
Original line number Diff line number Diff line
@@ -16,5 +16,7 @@ empeg 
	- Empeg documentation

mem_alignment

	- alignment abort handler documentation

memory.txt

	- description of the virtual memory layout

nwfpe

	- NWFPE floating point emulator documentation

Documentation/filesystems/ext3.txt

+13 −13
Original line number Diff line number Diff line
@@ -57,19 +57,19 @@ oldalloc This disables the Orlov block allocator and enables the 
			we'd like to get some feedback if it's the contrary for

			you.



user_xattr	(*)	Enables POSIX Extended Attributes. It's enabled by

			default, however you need to confifure its support

			(CONFIG_EXT3_FS_XATTR). This is neccesary if you want

			to use POSIX Acces Control Lists support. You can visit

			http://acl.bestbits.at to know more about POSIX Extended

			attributes.



nouser_xattr		Disables POSIX Extended Attributes.



acl		(*)	Enables POSIX Access Control Lists support. This is

			enabled by default, however you need to configure

			its support (CONFIG_EXT3_FS_POSIX_ACL). If you want

			to know more about ACLs visit http://acl.bestbits.at

user_xattr		Enables Extended User Attributes. Additionally, you need

			to have extended attribute support enabled in the kernel

			configuration (CONFIG_EXT3_FS_XATTR). See the attr(5)

			manual page and http://acl.bestbits.at to learn more

			about extended attributes.



nouser_xattr		Disables Extended User Attributes.



acl			Enables POSIX Access Control Lists support.  Additionally,

			you need to have ACL support enabled in the kernel

			configuration (CONFIG_EXT3_FS_POSIX_ACL). See the acl(5)

			manual page and http://acl.bestbits.at for more

			information.



noacl			This option disables POSIX Access Control List support.

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -536,7 +536,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Maintained



BUSLOGIC SCSI DRIVER
@@ -834,7 +834,7 @@ P: LinuxTV.org Project 
M: 	linux-dvb-maintainer@linuxtv.org

L: 	linux-dvb@linuxtv.org (subscription required)

W:	http://linuxtv.org/

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Supported



EATA-DMA SCSI DRIVER
@@ -1284,8 +1284,8 @@ T: git kernel.org:/pub/scm/linux/kernel/git/roland/infiniband.git 
S:	Supported



INPUT (KEYBOARD, MOUSE, JOYSTICK) DRIVERS

P:	Vojtech Pavlik

M:	vojtech@suse.cz

P:	Dmitry Torokhov

M:	dtor_core@ameritech.net

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
@@ -2896,7 +2896,7 @@ P: Mauro Carvalho Chehab 
M:	mchehab@brturbo.com.br

L:	video4linux-list@redhat.com

W:	http://linuxtv.org

T:	quilt http://www.linuxtv.org/download/quilt/

T:	git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git

S:	Maintained



W1 DALLAS'S 1-WIRE BUS

Makefile

+3 −3
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 15

EXTRAVERSION =-rc5

NAME=Affluent Albatross

EXTRAVERSION =

NAME=Sliding Snow Leopard



# *DOCUMENTATION*

# To see a list of typical targets execute "make help"
@@ -408,7 +408,7 @@ outputmakefile: 
# of make so .config is not included in this case either (for *config).



no-dot-config-targets := clean mrproper distclean \

			 cscope TAGS tags help %docs check% kernelrelease

			 cscope TAGS tags help %docs check%



config-targets := 0

mixed-targets  := 0

arch/alpha/kernel/machvec_impl.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ 
#define CAT1(x,y)  x##y

#define CAT(x,y)   CAT1(x,y)



#define DO_DEFAULT_RTC rtc_port: 0x70

#define DO_DEFAULT_RTC .rtc_port = 0x70



#define DO_EV4_MMU							\

	.max_asn =			EV4_MAX_ASN,			\