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

Commit cbb7fe12 authored by Steve French's avatar Steve French
Browse files

Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 7b0c8fcf a939b96c

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ include/linux/compile.h 
include/linux/version.h

include/linux/utsrelease.h

include/linux/bounds.h

include/generated



# stgit generated dirs

patches-*

Documentation/kbuild/makefiles.txt

+10 −0
Original line number Diff line number Diff line
@@ -316,6 +316,16 @@ more details, with real examples. 
		#arch/m68k/fpsp040/Makefile

		ldflags-y := -x



    subdir-ccflags-y, subdir-asflags-y

	The two flags listed above are similar to ccflags-y and as-falgs-y.

	The difference is that the subdir- variants has effect for the kbuild

	file where tey are present and all subdirectories.

	Options specified using subdir-* are added to the commandline before

	the options specified using the non-subdir variants.



	Example:

		subdir-ccflags-y := -Werror



    CFLAGS_$@, AFLAGS_$@



	CFLAGS_$@ and AFLAGS_$@ only apply to commands in current

Documentation/lguest/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
lguest

Documentation/lguest/lguest.txt

+6 −5
Original line number Diff line number Diff line
@@ -3,11 +3,11 @@ 
 /,    /`      - or, A Young Coder's Illustrated Hypervisor

 \\"--\\    http://lguest.ozlabs.org



Lguest is designed to be a minimal hypervisor for the Linux kernel, for

Linux developers and users to experiment with virtualization with the

minimum of complexity.  Nonetheless, it should have sufficient

features to make it useful for specific tasks, and, of course, you are

encouraged to fork and enhance it (see drivers/lguest/README).

Lguest is designed to be a minimal 32-bit x86 hypervisor for the Linux kernel,

for Linux developers and users to experiment with virtualization with the

minimum of complexity.  Nonetheless, it should have sufficient features to

make it useful for specific tasks, and, of course, you are encouraged to fork

and enhance it (see drivers/lguest/README).



Features:
@@ -37,6 +37,7 @@ Running Lguest: 
     "Paravirtualized guest support" = Y

        "Lguest guest support" = Y

     "High Memory Support" = off/4GB

     "PAE (Physical Address Extension) Support" = N

     "Alignment value to which kernel should be aligned" = 0x100000

        (CONFIG_PARAVIRT=y, CONFIG_LGUEST_GUEST=y, CONFIG_HIGHMEM64G=n and

         CONFIG_PHYSICAL_ALIGN=0x100000)

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -1287,6 +1287,14 @@ S: Maintained 
F:	Documentation/video4linux/bttv/

F:	drivers/media/video/bt8xx/bttv*



CACHEFILES: FS-CACHE BACKEND FOR CACHING ON MOUNTED FILESYSTEMS

P:	David Howells

M:	dhowells@redhat.com

L:	linux-cachefs@redhat.com

S:	Supported

F:	Documentation/filesystems/caching/cachefiles.txt

F:	fs/cachefiles/



CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER

P:	Jonathan Corbet

M:	corbet@lwn.net
@@ -2325,6 +2333,15 @@ F: Documentation/power/freezing-of-tasks.txt 
F:	include/linux/freezer.h

F:	kernel/freezer.c



FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS

P:	David Howells

M:	dhowells@redhat.com

L:	linux-cachefs@redhat.com

S:	Supported

F:	Documentation/filesystems/caching/

F:	fs/fscache/

F:	include/linux/fscache*.h



FTRACE

P:	Steven Rostedt

M:	rostedt@goodmis.org
@@ -5235,7 +5252,12 @@ M: perex@perex.cz 
P:	Takashi Iwai

M:	tiwai@suse.de

L:	alsa-devel@alsa-project.org (subscribers-only)

W:	http://www.alsa-project.org/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git

T:	git git://git.alsa-project.org/alsa-kernel.git

S:	Maintained

F:	Documentation/sound/

F:	include/sound/

F:	sound/



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)