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

Commit bb803cfb authored by David S. Miller's avatar David S. Miller
Browse files

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

Conflicts:
	drivers/scsi/fcoe/fcoe.c
parents 3878fb6f 511e11e3

.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/ABI/testing/debugfs-pktcdvd

+3 −3
Original line number Diff line number Diff line 
What:           /debug/pktcdvd/pktcdvd[0-7]

What:           /sys/kernel/debug/pktcdvd/pktcdvd[0-7]

Date:           Oct. 2006

KernelVersion:  2.6.20

Contact:        Thomas Maier <balagi@justmail.de>
@@ -10,10 +10,10 @@ debugfs interface 
The pktcdvd module (packet writing driver) creates

these files in debugfs:



/debug/pktcdvd/pktcdvd[0-7]/

/sys/kernel/debug/pktcdvd/pktcdvd[0-7]/

    info            (0444) Lots of driver statistics and infos.



Example:

-------



cat /debug/pktcdvd/pktcdvd0/info
 
cat /sys/kernel/debug/pktcdvd/pktcdvd0/info

Documentation/ABI/testing/sysfs-firmware-acpi

+6 −2
Original line number Diff line number Diff line
@@ -69,9 +69,13 @@ Description: 
		gpe1F:	     0	invalid

		gpe_all:    1192

		sci:	1194

		sci_not:     0	



		sci - The total number of times the ACPI SCI

		has claimed an interrupt.

		sci - The number of times the ACPI SCI

		has been called and claimed an interrupt.



		sci_not - The number of times the ACPI SCI

		has been called and NOT claimed an interrupt.



		gpe_all - count of SCI caused by GPEs.

Documentation/DocBook/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ quiet_cmd_db2pdf = PDF $@ 
	$(call cmd,db2pdf)





main_idx = Documentation/DocBook/index.html

index = index.html

main_idx = Documentation/DocBook/$(index)

build_main_index = rm -rf $(main_idx) && \

		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \

		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
@@ -232,7 +233,7 @@ clean-files := $(DOCBOOKS) \ 
	$(patsubst %.xml, %.pdf,  $(DOCBOOKS)) \

	$(patsubst %.xml, %.html, $(DOCBOOKS)) \

	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \

	$(C-procfs-example)

	$(C-procfs-example) $(index)



clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man

Documentation/DocBook/kernel-api.tmpl

+5 −1
Original line number Diff line number Diff line
@@ -190,16 +190,20 @@ X!Ekernel/module.c 
!Edrivers/pci/pci.c

!Edrivers/pci/pci-driver.c

!Edrivers/pci/remove.c

!Edrivers/pci/pci-acpi.c

!Edrivers/pci/search.c

!Edrivers/pci/msi.c

!Edrivers/pci/bus.c

!Edrivers/pci/access.c

!Edrivers/pci/irq.c

!Edrivers/pci/htirq.c

<!-- FIXME: Removed for now since no structured comments in source

X!Edrivers/pci/hotplug.c

-->

!Edrivers/pci/probe.c

!Edrivers/pci/slot.c

!Edrivers/pci/rom.c

!Edrivers/pci/iov.c

!Idrivers/pci/pci-sysfs.c

     </sect1>

     <sect1><title>PCI Hotplug Support Library</title>

!Edrivers/pci/hotplug/pci_hotplug_core.c