Merge branch 'master' into upstream (acc696d9) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/filesystems/sysfs.txt

+5 −0

Original line number	Diff line number	Diff line
		@@ -246,6 +246,7 @@ class/
		devices/
		firmware/
		net/
		fs/

		devices/ contains a filesystem representation of the device tree. It maps
		directly to the internal kernel device tree, which is a hierarchy of
		@@ -264,6 +265,10 @@ drivers/ contains a directory for each device driver that is loaded
		for devices on that particular bus (this assumes that drivers do not
		span multiple bus types).

		fs/ contains a directory for some filesystems. Currently each
		filesystem wanting to export attributes must create its own hierarchy
		below fs/ (see ./fuse.txt for an example).


		More information can driver-model specific features can be found in
		Documentation/driver-model/.

+12 −0

Original line number	Diff line number	Diff line
		@@ -421,6 +421,14 @@ L: linux-hams@vger.kernel.org
		W: http://www.baycom.org/~tom/ham/ham.html
		S: Maintained

		BCM43XX WIRELESS DRIVER
		P: Michael Buesch
		M: mb@bu3sch.de
		P: Stefano Brivio
		M: st3@riseup.net
		W: http://bcm43xx.berlios.de/
		S: Maintained

		BEFS FILE SYSTEM
		P: Sergey S. Kostyliov
		M: rathamahata@php4.ru
		@@ -2065,8 +2073,12 @@ P: Matthew Wilcox
		M: matthew@wil.cx
		P: Grant Grundler
		M: grundler@parisc-linux.org
		P: Kyle McMartin
		M: kyle@parisc-linux.org
		L: parisc-linux@parisc-linux.org
		W: http://www.parisc-linux.org/
		T: git kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6.git
		T: cvs cvs.parisc-linux.org:/var/cvs/linux-2.6
		S: Maintained

		PCI ERROR RECOVERY

+1 −1

+4 −4

Original line number	Diff line number	Diff line
		@@ -43,8 +43,8 @@ strncpy:

		.align 4
		$multiword:
		subq $24, 1, $2 # clear the final bits in the prev word
		or $2, $24, $2
		subq $27, 1, $2 # clear the final bits in the prev word
		or $2, $27, $2
		zapnot $1, $2, $1
		subq $18, 1, $18

		@@ -70,8 +70,8 @@ $multiword:
		bne $18, 0b

		1: ldq_u $1, 0($16) # clear the leading bits in the final word
		subq $27, 1, $2
		or $2, $27, $2
		subq $24, 1, $2
		or $2, $24, $2

		zap $1, $2, $1
		stq_u $1, 0($16)

+1 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ tune-$(CONFIG_CPU_XSC3) :=$(call cc-option,-mtune=xscale,-mtune=strongarm110) -
		tune-$(CONFIG_CPU_V6) :=$(call cc-option,-mtune=arm1136j-s,-mtune=strongarm)

		ifeq ($(CONFIG_AEABI),y)
		CFLAGS_ABI :=-mabi=aapcs -mno-thumb-interwork
		CFLAGS_ABI :=-mabi=aapcs-linux -mno-thumb-interwork
		else
		CFLAGS_ABI :=$(call cc-option,-mapcs-32,-mabi=apcs-gnu) $(call cc-option,-mno-thumb-interwork,)
		endif