Linus Torvalds df58bee21e Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits) x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c x86, mce: CE in last bank prevents panic by unknown MCE x86, mce: Fake panic support for MCE testing x86, mce: Move debugfs mce dir creating to mce.c x86, mce: Support specifying raise mode for software MCE injection x86, mce: Support specifying context for software mce injection x86, mce: fix reporting of Thermal Monitoring mechanism enabled x86, mce: remove never executed code x86, mce: add missing __cpuinit tags x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs x86: mce: Lower maximum number of banks to architecture limit x86: mce: macros to compute banks MSRs x86: mce: Move per bank data in a single datastructure x86: mce: Move code in mce.c x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE x86: mce: Remove old i386 machine check code x86: mce: Update X86_MCE description in x86/Kconfig x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE x86, mce: use atomic_inc_return() instead of add by 1 ... Manually fixed up trivial conflicts: Documentation/feature-removal-schedule.txt arch/x86/kernel/cpu/mcheck/mce.c		2009-09-17 21:07:08 -07:00
..
ABI	PCI: expose function reset capability in sysfs	2009-09-09 13:29:24 -07:00
accounting	Documentation/accounting/getdelays.c intialize the variable before using it	2009-06-16 19:47:51 -07:00
acpi
aoe
arm	Nicolas Pitre has a new email address	2009-09-15 09:37:12 -07:00
auxdisplay
blackfin
block	Trivial typo fixes in Documentation/block/data-integrity.txt.	2009-07-01 10:56:25 +02:00
blockdev	mflash: initial support	2009-04-07 08:12:38 +02:00
cdrom	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
cgroups	cpusets: document adding/removing cpus to cpuset elaborately	2009-06-30 18:56:01 -07:00
connector	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2009-07-23 19:03:51 -07:00
console
cpu-freq	[CPUFREQ] minor correction to cpu-freq documentation	2009-06-15 11:49:42 -04:00
cpuidle
cris
crypto
development-process	docs: Encourage better changelogs in the development process document	2009-06-04 10:32:49 -06:00
device-mapper	dm raid1: add userspace log	2009-06-22 10:12:35 +01:00
DocBook	uio: add generic driver for PCI 2.3 devices	2009-09-15 09:50:48 -07:00
driver-model	driver model: fix show/store prototypes in doc.	2009-07-12 13:02:10 -07:00
dvb	V4L/DVB (12206): get_dvb_firmware: Correct errors in MPC718 firmware extraction logic	2009-07-05 19:21:49 -03:00
early-userspace
fault-injection	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
fb	Documentation/fb/vesafb.txt: fix typo	2009-06-16 19:47:58 -07:00
filesystems	Merge branch 'docs-next' of git://git.lwn.net/linux-2.6	2009-09-14 17:52:32 -07:00
firmware_class	driver core: fix documentation of request_firmware_nowait	2009-06-15 21:30:24 -07:00
frv
hwmon	hwmon: (pcf8591) Documentation clean-ups	2009-09-15 17:18:14 +02:00
i2c	i2c: Add a sysfs interface to instantiate devices	2009-06-19 16:58:20 +02:00
i2o
ia64	trivial: Fix misspelling of firmware	2009-03-30 15:21:59 +02:00
ide	ide: preserve Host Protected Area by default (v2)	2009-06-07 13:52:52 +02:00
infiniband	IPoIB: Document newish features	2009-04-08 13:52:01 -07:00
input	Input: add new driver for Sentelic Finger Sensing Pad	2009-08-19 21:46:09 -07:00
ioctl	Merge branch 'kvm-updates/2.6.32' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2009-09-14 17:43:43 -07:00
isdn	isdn: clean up documentation index	2009-06-20 01:10:38 -07:00
ja_JP	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
kbuild	kconfig: resort the documentation of the environment variables	2009-06-09 22:37:47 +02:00
kdump	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
ko_KR
kvm	KVM: Document KVM_CAP_IRQCHIP	2009-09-10 10:46:55 +03:00
laptops	thinkpad-acpi: remove dock and bay subdrivers	2009-08-01 23:46:58 -04:00
lguest	lguest and virtio: cleanup struct definitions to Linux style.	2009-07-30 16:03:46 +09:30
m68k
make
mips
misc-devices	drivers/misc/isl29003.c: driver for the ISL29003 ambient light sensor	2009-04-01 08:59:18 -07:00
mn10300	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
mtd	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
namespaces
netlabel
networking	sctp: Sysctl configuration for IPv4 Address Scoping	2009-09-04 18:21:01 -04:00
parisc
PCI	PCI: document PCIe fundamental reset interfaces	2009-09-09 13:29:38 -07:00
pcmcia
power	PM: Introduce core framework for run-time PM of I/O devices (rev. 17)	2009-08-23 00:04:44 +02:00
powerpc	Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds	2009-06-28 11:02:32 -07:00
pps	LinuxPPS: core support	2009-06-18 13:04:04 -07:00
prctl
RCU	rcu: Remove CONFIG_PREEMPT_RCU	2009-08-23 10:32:40 +02:00
s390	[S390] s390dbf: Add description for usage of "%s" in sprintf events	2009-09-11 10:29:53 +02:00
scheduler	sched: Documentation/sched-rt-group: Fix style issues & bump version	2009-06-21 13:12:46 +02:00
scsi	Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6	2009-06-17 09:50:44 -07:00
serial
sh
sound	Merge branch 'topic/snd-printk' into for-linus	2009-09-10 15:33:03 +02:00
sparc
spi	spi: new spi->mode bits	2009-06-30 18:56:00 -07:00
sysctl	[S390] add call home support	2009-09-11 10:29:49 +02:00
telephony
thermal
timers	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
trace	Merge branch 'linus' into tracing/core	2009-09-17 20:53:10 +02:00
uml
usb	trivial: usb: fix missing space typo in doc	2009-06-12 18:01:51 +02:00
video4linux	V4L/DVB (12720): em28xx-cards: Add vendor/product id for Kworld DVD Maker 2	2009-09-14 22:39:19 -03:00
vm	slub: add option to disable higher order debugging slabs	2009-07-10 09:52:55 +03:00
w1
watchdog	[WATCHDOG] hpwdt: Add NMI priority option	2009-06-23 07:13:45 +00:00
wimax
x86	x86, intel_txt: Intel TXT boot support	2009-07-21 11:49:06 -07:00
zh_CN
00-INDEX	Bluetooth: Add documentation for Marvell Bluetooth driver	2009-08-22 14:25:32 -07:00
applying-patches.txt
atomic_ops.txt	Documentation/atomic_ops.txt: fix sample code	2009-06-16 19:47:52 -07:00
bad_memory.txt
basic_profiling.txt
binfmt_misc.txt
braille-console.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
bt8xxgpio.txt
btmrvl.txt	Bluetooth: Add documentation for Marvell Bluetooth driver	2009-08-22 14:25:32 -07:00
BUG-HUNTING
c2port.txt
cachetlb.txt
Changes	Documentation/Changes: perl is needed to build the kernel	2009-06-18 13:03:46 -07:00
CodingStyle	trivial: fix typo milisecond/millisecond for documentation and source comments.	2009-06-12 18:01:46 +02:00
cpu-hotplug.txt
cpu-load.txt
cputopology.txt
credentials.txt
dcdbas.txt
debugging-modules.txt
debugging-via-ohci1394.txt
dell_rbu.txt	trivial: Documentation/dell_rbu.txt: fix typos	2009-06-12 18:01:50 +02:00
devices.txt	lanana: assign a device name and numbering for MAX3100	2009-04-07 08:44:05 -07:00
DMA-API.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
DMA-attributes.txt
DMA-ISA-LPC.txt
DMA-mapping.txt	dma-mapping: update the old macro DMA_nBIT_MASK related documentations	2009-04-07 08:31:12 -07:00
dmaengine.txt
dontdiff	sparc: Kill PROM console driver.	2009-09-15 17:04:38 -07:00
dynamic-debug-howto.txt	Dynamic debug: allow simple quoting of words	2009-03-24 16:38:27 -07:00
edac.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
eisa.txt
email-clients.txt
feature-removal-schedule.txt	Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2009-09-17 21:07:08 -07:00
flexible-arrays.txt	Document the flex_array library.	2009-09-10 14:33:36 -06:00
futex-requeue-pi.txt	futex: add requeue-pi documentation	2009-05-09 07:12:50 +02:00
gcov.txt	gcov: fix documentation	2009-06-30 18:55:59 -07:00
gpio.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
highuid.txt
HOWTO
hw_random.txt
ics932s401
initrd.txt
intel_txt.txt	x86, intel_txt: Intel TXT boot support	2009-07-21 11:49:06 -07:00
Intel-IOMMU.txt
io_ordering.txt
io-mapping.txt
IO-mapping.txt	Documentation: move DMA-mapping.txt to Doc/PCI/	2009-01-29 18:19:29 -08:00
iostats.txt
IPMI.txt
IRQ-affinity.txt
IRQ.txt
irqflags-tracing.txt
isapnp.txt
java.txt
kernel-doc-nano-HOWTO.txt	kernel-doc: restrict syntax for private: and public:	2009-05-02 15:36:10 -07:00
kernel-docs.txt
kernel-parameters.txt	MIPS: Loongson: Add a machtype kernel command line argument	2009-09-17 20:07:47 +02:00
keys-request-key.txt
keys.txt	KEYS: Add a keyctl to install a process's session keyring on its parent [try #6]	2009-09-02 21:29:22 +10:00
kmemcheck.txt	kmemcheck: add the kmemcheck documentation	2009-06-13 14:27:20 +02:00
kmemleak.txt	kmemleak: add clear command support	2009-09-08 16:36:08 +01:00
kobject.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
kprobes.txt	debugfs: Fix terminology inconsistency of dir name to mount debugfs filesystem.	2009-06-15 21:30:28 -07:00
kref.txt
ldm.txt
leds-class.txt
leds-lp3944.txt	leds: LED driver for National Semiconductor LP3944 Funlight Chip	2009-06-23 20:21:38 +01:00
local_ops.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
lockdep-design.txt	lockdep: Fix typos in documentation	2009-08-07 12:03:46 +02:00
lockstat.txt
logo.gif	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
logo.txt	Revert "linux.conf.au 2009: Tuz"	2009-04-27 12:00:27 -07:00
magic-number.txt
Makefile
ManagementStyle
markers.txt
mca.txt
md.txt	Documentation/md.txt update	2009-03-31 15:18:37 +11:00
memory-barriers.txt	sched: Document memory barriers implied by sleep/wake-up primitives	2009-04-29 14:15:55 +02:00
memory-hotplug.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
memory.txt
mono.txt
mutex-design.txt
nmi_watchdog.txt
nommu-mmap.txt
numastat.txt
oops-tracing.txt
parport-lowlevel.txt
parport.txt
pi-futex.txt
pnp.txt
preempt-locking.txt
printk-formats.txt
prio_tree.txt
rbtree.txt	trivial: rbtree.txt: fix rb_entry() parameters in sample code	2009-06-12 18:01:47 +02:00
rfkill.txt	rfkill: export persistent attribute in sysfs	2009-06-19 11:50:18 -04:00
robust-futex-ABI.txt	futex: documentation: fix inconsistent description of futex list_op_pending	2009-06-18 13:03:56 -07:00
robust-futexes.txt
rt-mutex-design.txt
rt-mutex.txt
rtc.txt
SAK.txt
SecurityBugs
SELinux.txt
serial-console.txt
sgi-ioc4.txt
sgi-visws.txt
slow-work.txt	Document the slow work thread pool	2009-04-03 16:42:35 +01:00
SM501.txt	trivial: Miscellaneous documentation typo fixes	2009-06-12 18:01:47 +02:00
Smack.txt	smack: implement logging V3	2009-04-14 09:00:23 +10:00
sparse.txt	Documentation: explain the difference between __bitwise and __bitwise__	2009-04-11 08:18:11 +02:00
spinlocks.txt
stable_api_nonsense.txt
stable_kernel_rules.txt
SubmitChecklist	block: rename CONFIG_LBD to CONFIG_LBDAF	2009-06-19 08:08:50 +02:00
SubmittingDrivers
SubmittingPatches	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2009-06-14 13:46:25 -07:00
svga.txt
sysfs-rules.txt	Doc/sysfs-rules: Swap the order of the words so the sentence makes more sense	2009-05-08 19:22:20 -07:00
sysrq.txt	sysrq, kdump: make sysrq-c consistent	2009-07-29 19:10:36 -07:00
tomoyo.txt	tomoyo: add Documentation/tomoyo.txt	2009-04-14 09:14:58 +10:00
unaligned-memory-access.txt
unicode.txt
unshare.txt
VGA-softcursor.txt
vgaarbiter.txt	PCI/VGA: add VGA arbitration documentation	2009-09-09 13:29:42 -07:00
video-output.txt
volatile-considered-harmful.txt
voyager.txt
zorro.txt