James Morris 5a2f3a02ae Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next ... Conflicts: fs/attr.c Resolve conflict manually. Signed-off-by: James Morris <jmorris@namei.org>		2011-08-09 10:31:03 +10:00
..
ABI	Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next	2011-08-09 10:31:03 +10:00
DocBook	Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6	2011-07-30 00:08:53 -07:00
PCI	Fix common misspellings	2011-03-31 11:26:23 -03:00
RCU	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
accounting	Documentation: update cgroupfs mount point	2011-06-15 21:52:50 -07:00
acpi	ACPI, APEI, EINJ Param support is disabled by default	2011-08-03 11:15:59 -04:00
aoe	…
arm	Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc	2011-07-25 12:43:28 -07:00
auxdisplay	…
blackfin	Blackfin: spi-docs: further clarify GPIO CS behavior with various modes	2011-07-23 01:18:35 -04:00
block	block: strict rq_affinity	2011-07-23 20:44:25 +02:00
blockdev	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
cdrom	…
cgroups	memcg: add memory.vmscan_stat	2011-07-26 16:49:42 -07:00
connector	…
console	…
cpu-freq	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
cpuidle	…
cris	…
crypto	…
development-process	sched: Generalize sleep inside spinlock detection	2011-06-23 00:44:38 +02:00
device-mapper	dm crypt: optionally support discard requests	2011-08-02 12:32:08 +01:00
devicetree	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input	2011-08-03 22:00:09 -10:00
driver-model	DOCUMENTATION: Replace create_device() with device_create().	2011-06-07 10:04:22 -07:00
dvb	[media] em28xx: Change firmware name for Terratec H5 DRX-K	2011-07-27 17:55:51 -03:00
early-userspace	…
fault-injection	fault-injection: add ability to export fault_attr in arbitrary directory	2011-08-03 14:25:20 -10:00
fb	DRM: clean up and document parsing of video= parameter	2011-07-25 12:02:26 +01:00
filesystems	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6	2011-07-26 18:30:20 -07:00
firmware_class	…
frv	Documentation: add pointer to name_to_dev_t for root= values	2011-08-03 14:25:21 -10:00
hid	…
hwmon	Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging	2011-07-30 08:57:57 -10:00
i2c	i2c-i801: SMBus patch for Intel Panther Point DeviceIDs	2011-05-24 20:58:49 +02:00
i2o	doc: i2o: fix typo 'Settting'	2011-06-07 16:06:01 +02:00
ia64	Fix common misspellings	2011-03-31 11:26:23 -03:00
ide	…
infiniband	…
input	Input: elantech - describe further the protocol	2011-05-16 22:48:24 -07:00
ioctl	Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile	2011-08-02 21:16:11 -10:00
isdn	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
ja_JP	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-07-25 23:06:24 -07:00
kbuild	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
kdump	…
ko_KR	…
laptops	thinkpad-acpi: handle HKEY 0x4010, 0x4011 events	2011-07-07 10:39:05 -04:00
leds	Documentation: consolidate leds files to leds/ subdir	2011-04-04 17:51:47 -07:00
m68k	Documentation: add pointer to name_to_dev_t for root= values	2011-08-03 14:25:21 -10:00
make	…
mips	Fix common misspellings	2011-03-31 11:26:23 -03:00
misc-devices	Fix common misspellings	2011-03-31 11:26:23 -03:00
mmc	mmc: documentation of mmc non-blocking request usage and design.	2011-07-21 10:34:52 -04:00
mn10300	…
mtd	…
namespaces	…
netlabel	…
networking	Documentation/bonding.txt: Update to 3.x version numbers	2011-08-01 17:59:44 -07:00
nfc	…
parisc	…
pcmcia	…
power	PM / Runtime: Allow _put_sync() from interrupts-disabled context	2011-08-05 21:45:20 +02:00
powerpc	Fix common misspellings	2011-03-31 11:26:23 -03:00
pps	…
prctl	…
pti	Kernel documentation for the PTI feature.	2011-05-13 16:31:00 -07:00
ptp	ptp: Added a brand new class driver for ptp clocks.	2011-05-23 13:01:00 -07:00
rapidio	rapidio: add RapidIO documentation	2011-03-23 19:46:41 -07:00
s390	[S390] remove tape block docu	2011-07-24 10:48:22 +02:00
scheduler	Merge branch 'master' into for-next	2011-07-11 14:15:55 +02:00
scsi	[SCSI] megaraid_sas Version to 5.40-rc1 and Changelog update	2011-07-27 15:45:22 +04:00
security	encrypted-keys: move ecryptfs documentation to proper location	2011-06-30 19:08:14 +10:00
serial	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
sh	…
sound	ALSA: hda - Add documentation for codec-specific mixer controls	2011-07-19 09:34:10 +02:00
sparc	…
spi	spi/pxa2xx: Remove unavailable ssp_type from documentation	2011-06-18 22:36:30 -06:00
sysctl	ipc: introduce shm_rmid_forced sysctl	2011-07-26 16:49:44 -07:00
target	[SCSI] tcm_mod_builder.py: Fix generated *_drop_nodeacl() handler	2011-03-23 11:36:45 -05:00
telephony	Fix common misspellings	2011-03-31 11:26:23 -03:00
thermal	…
timers	doc: timers-howto: fix a typo ("unsgined")	2011-05-17 10:52:02 +02:00
trace	tracing/kprobes: Support module init function probing	2011-07-15 15:17:14 -04:00
usb	Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6	2011-07-25 23:08:32 -07:00
vDSO	Document the vDSO and add a reference parser	2011-07-14 17:57:09 -07:00
video4linux	[media] v4l2-framework.txt: update v4l2_event section	2011-07-27 17:53:33 -03:00
virtual	Merge branch 'kvm-updates/3.1' of git://git.kernel.org/pub/scm/virt/kvm/kvm	2011-07-24 09:07:03 -07:00
vm	Documentation: update cgroupfs mount point	2011-06-15 21:52:50 -07:00
w1	Fix common misspellings	2011-03-31 11:26:23 -03:00
watchdog	watchdog: WatchDog Timer Driver Core - Add minimum and max timeout	2011-07-28 08:01:18 +00:00
wimax	…
x86	Merge branch 'x86-vdso-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-07-22 17:05:15 -07:00
zh_CN	Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6	2011-07-25 23:06:24 -07:00
.gitignore	…
00-INDEX	Merge branch 'docs-security' into docs-move	2011-05-20 09:10:04 -07:00
BUG-HUNTING	…
Changes	Documentation/Changes: remove some really obsolete text	2011-07-11 16:48:38 -07:00
CodingStyle	CodingStyle: Document the exception of not splitting user-visible strings, for grepping	2011-08-06 11:59:07 -07:00
DMA-API-HOWTO.txt	Documentation/DMA-API-HOWTO.txt: fix misleading example	2011-07-26 16:49:45 -07:00
DMA-API.txt	…
DMA-ISA-LPC.txt	…
DMA-attributes.txt	…
HOWTO	Documentation: update LXR web link	2011-05-23 15:14:11 -07:00
IPMI.txt	…
IRQ-affinity.txt	bitmap, irq: add smp_affinity_list interface to /proc/irq	2011-05-25 08:39:45 -07:00
IRQ.txt	…
Intel-IOMMU.txt	…
Makefile	…
ManagementStyle	…
SAK.txt	…
SM501.txt	…
SecurityBugs	Fix common misspellings	2011-03-31 11:26:23 -03:00
SubmitChecklist	Documentation/SubmitChecklist: add RCU debug config options	2011-07-25 20:57:17 -07:00
SubmittingDrivers	Fix common misspellings	2011-03-31 11:26:23 -03:00
SubmittingPatches	Documentation: update GregKH links	2011-05-23 15:14:11 -07:00
VGA-softcursor.txt	…
applying-patches.txt	…
atomic_ops.txt	Documentation/atomic_ops.txt: avoid volatile in sample code	2011-05-26 17:12:34 -07:00
bad_memory.txt	…
basic_profiling.txt	…
binfmt_misc.txt	…
braille-console.txt	…
bt8xxgpio.txt	…
btmrvl.txt	…
bus-virt-phys-mapping.txt	…
cachetlb.txt	mm: convert mm->cpu_vm_cpumask into cpumask_var_t	2011-05-25 08:39:21 -07:00
circular-buffers.txt	…
coccinelle.txt	…
cpu-hotplug.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
cpu-load.txt	…
cputopology.txt	…
dcdbas.txt	…
debugging-modules.txt	…
debugging-via-ohci1394.txt	…
dell_rbu.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
devices.txt	…
dmaengine.txt	Improve slave/cyclic DMA engine documentation	2011-07-27 20:33:48 +05:30
dontdiff	Documentation: update dontdiff file	2011-05-23 15:14:11 -07:00
dynamic-debug-howto.txt	Merge branch 'docs-next' of git://git.lwn.net/linux-2.6	2011-03-27 19:46:59 -07:00
edac.txt	Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6	2011-04-07 11:14:49 -07:00
eisa.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
email-clients.txt	…
feature-removal-schedule.txt	acer-wmi: schedule threeg and interface sysfs for feature removal	2011-08-05 14:45:34 -04:00
flexible-arrays.txt	flex_array: flex_array_prealloc takes a number of elements, not an end	2011-04-28 16:12:47 -04:00
futex-requeue-pi.txt	…
gcov.txt	…
gpio.txt	…
highuid.txt	…
hw_random.txt	…
hwspinlock.txt	…
init.txt	…
initrd.txt	…
intel_txt.txt	…
io-mapping.txt	…
io_ordering.txt	…
iostats.txt	Documentation/iostats.txt: bit-size reference etc.	2011-03-23 20:44:18 +01:00
irqflags-tracing.txt	Fix common misspellings	2011-03-31 11:26:23 -03:00
isapnp.txt	…
java.txt	…
kernel-doc-nano-HOWTO.txt	…
kernel-docs.txt	…
kernel-parameters.txt	Merge branch 'next-evm' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/ima-2.6 into next	2011-08-09 10:31:03 +10:00
kmemcheck.txt	…
kmemleak.txt	Documentation: update kmemleak supported archs	2011-06-15 21:52:50 -07:00
kobject.txt	…
kprobes.txt	…
kref.txt	…
ldm.txt	…
local_ops.txt	…
lockdep-design.txt	…
lockstat.txt	Documentation: Add statistics about nested locks	2011-05-28 17:03:29 +02:00
logo.gif	…
logo.txt	…
magic-number.txt	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
mca.txt	doc: fix wrong arch/i386 references	2011-06-13 13:43:05 +02:00
md.txt	md: update documentation for md/rdev/state sysfs interface	2011-07-28 11:31:48 +10:00
media-framework.txt	[media] v4l: Fix minor typos in the documentation	2011-07-27 17:53:10 -03:00
memory-barriers.txt	…
memory-hotplug.txt	…
memory.txt	…
mono.txt	…
mutex-design.txt	…
nmi_watchdog.txt	…
nommu-mmap.txt	…
numastat.txt	…
oops-tracing.txt	…
padata.txt	…
parport-lowlevel.txt	…
parport.txt	…
pi-futex.txt	…
pnp.txt	…
preempt-locking.txt	…
printk-formats.txt	Documentation: update printk-formats.txt	2011-06-15 21:52:50 -07:00
prio_tree.txt	…
rbtree.txt	Documentation: Update augmented rbtree documentation	2011-07-24 10:03:05 -07:00
rfkill.txt	…
robust-futex-ABI.txt	…
robust-futexes.txt	…
rt-mutex-design.txt	…
rt-mutex.txt	…
rtc.txt	…
serial-console.txt	…
sgi-ioc4.txt	…
sgi-visws.txt	…
sparse.txt	…
spinlocks.txt	Documentation/spinlocks.txt: Remove reference to sti()/cli()	2011-07-11 12:45:04 -07:00
stable_api_nonsense.txt	doc: stable_api_nonsense.txt: fix paragraph to make more sense.	2011-03-30 12:02:05 +02:00
stable_kernel_rules.txt	…
svga.txt	…
sysfs-rules.txt	…
sysrq.txt	…
unaligned-memory-access.txt	…
unicode.txt	…
unshare.txt	…
vgaarbiter.txt	Documentation: fix vgaarbiter.txt typos etc.	2011-05-23 15:14:11 -07:00
video-output.txt	…
volatile-considered-harmful.txt	…
workqueue.txt	workqueue: Document debugging tricks	2011-03-31 13:40:42 +02:00
xz.txt	…
zorro.txt	…