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

Commit 01234f3c authored by Felix Blyakher's avatar Felix Blyakher
Browse files

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

parents 8aa4349a 5955c7a2

Documentation/PCI/PCIEBUS-HOWTO.txt

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ the PCI Express Port Bus driver from loading a service driver. 


int pcie_port_service_register(struct pcie_port_service_driver *new)



This API replaces the Linux Driver Model's pci_module_init API. A

This API replaces the Linux Driver Model's pci_register_driver API. A

service driver should always calls pcie_port_service_register at

module init. Note that after service driver being loaded, calls

such as pci_enable_device(dev) and pci_set_master(dev) are no longer

Documentation/connector/cn_test.c

+2 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static void cn_test_timer_func(unsigned long __data) 


		memcpy(m + 1, data, m->len);



		cn_netlink_send(m, 0, gfp_any());

		cn_netlink_send(m, 0, GFP_ATOMIC);

		kfree(m);

	}
@@ -160,10 +160,8 @@ static int cn_test_init(void) 
		goto err_out;

	}



	init_timer(&cn_test_timer);

	cn_test_timer.function = cn_test_timer_func;

	setup_timer(&cn_test_timer, cn_test_timer_func, 0);

	cn_test_timer.expires = jiffies + HZ;

	cn_test_timer.data = 0;

	add_timer(&cn_test_timer);



	return 0;

Documentation/tracers/mmiotrace.txt

+2 −4
Original line number Diff line number Diff line
@@ -78,12 +78,10 @@ to view your kernel log and look for "mmiotrace has lost events" warning. If 
events were lost, the trace is incomplete. You should enlarge the buffers and

try again. Buffers are enlarged by first seeing how large the current buffers

are:

$ cat /debug/tracing/trace_entries

$ cat /debug/tracing/buffer_size_kb

gives you a number. Approximately double this number and write it back, for

instance:

$ echo 0 > /debug/tracing/tracing_enabled

$ echo 128000 > /debug/tracing/trace_entries

$ echo 1 > /debug/tracing/tracing_enabled

$ echo 128000 > /debug/tracing/buffer_size_kb

Then start again from the top.



If you are doing a trace for a driver project, e.g. Nouveau, you should also

MAINTAINERS

+7 −7
Original line number Diff line number Diff line
@@ -1905,10 +1905,10 @@ W: http://gigaset307x.sourceforge.net/ 
S:	Maintained



HARD DRIVE ACTIVE PROTECTION SYSTEM (HDAPS) DRIVER

P:	Robert Love

M:	rlove@rlove.org

M:	linux-kernel@vger.kernel.org

W:	http://www.kernel.org/pub/linux/kernel/people/rml/hdaps/

P:	Frank Seidel

M:	frank@f-seidel.de

L:	lm-sensors@lm-sensors.org

W:	http://www.kernel.org/pub/linux/kernel/people/fseidel/hdaps/

S:	Maintained



GSPCA FINEPIX SUBDRIVER
@@ -4925,11 +4925,11 @@ L: zd1211-devs@lists.sourceforge.net (subscribers-only) 
S:	Maintained



ZR36067 VIDEO FOR LINUX DRIVER

P:	Ronald Bultje

M:	rbultje@ronald.bitfreak.net

L:	mjpeg-users@lists.sourceforge.net

L:	linux-media@vger.kernel.org

W:	http://mjpeg.sourceforge.net/driver-zoran/

S:	Maintained

T:	Mercurial http://linuxtv.org/hg/v4l-dvb

S:	Odd Fixes



ZS DECSTATION Z85C30 SERIAL DRIVER

P:	Maciej W. Rozycki

Makefile

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

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Erotic Pickled Herring



# *DOCUMENTATION*
@@ -389,6 +389,7 @@ PHONY += outputmakefile 
# output directory.

outputmakefile:

ifneq ($(KBUILD_SRC),)

	$(Q)ln -fsn $(srctree) source

	$(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkmakefile \

	    $(srctree) $(objtree) $(VERSION) $(PATCHLEVEL)

endif
@@ -946,7 +947,6 @@ ifneq ($(KBUILD_SRC),) 
	    mkdir -p include2;                                          \

	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \

	fi

	ln -fsn $(srctree) source

endif



# prepare2 creates a makefile if using a separate output directory